Mercurial Repositories > eric / changeset
changeset
Merged with branch 'eric7' in order to prepare a new release.
Tue, 14 Jan 2025 17:29:56 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Tue, 14 Jan 2025 17:29:56 +0100
- branch
- eric7-maintenance
- changeset 11118
- 967a88a16a21
- parent 11064
- c2cb561a39b0 (current diff)
- parent 11117
- 183a20e30675 (diff)
- child 11119
- 3902fb1f4129
Merged with branch 'eric7' in order to prepare a new release.
--- a/docs/changelog.md Sat Nov 30 11:09:02 2024 +0100 +++ b/docs/changelog.md Tue Jan 14 17:29:56 2025 +0100 @@ -1,5 +1,25 @@ # Change Log +### Version 25.01 +- bug fixes +- General + - Made the code compatible with Qt/PyQt 6.8. +- Mercurial Interface + - Removed support for the `strip` extension (does not exist anymore). + - Moved `purge` and `shelve` extensions to the `Other Functions` menu + because they are builtin functions. + - Added support for the `fastexport` extension. + - Added support for the `uncommit` extension. +- pip Interface + - Added an action button to clean up the site-packages directory of + the selected environment. + - Changed the package search function to open an external web browser + with the package search term (PyPI does not support programmatic + search anymore). +- Plugin Repository + - Added a status label for 'Upgrade Available' that includes a copy of + the the upgradable plugin entries. + ### Version 24.12 - bug fixes - Debugger
--- a/eric7.epj Sat Nov 30 11:09:02 2024 +0100 +++ b/eric7.epj Tue Jan 14 17:29:56 2025 +0100 @@ -455,6 +455,7 @@ "src/eric7/Plugins/VcsPlugins/vcsGit/GitWorktreePathsDialog.ui", "src/eric7/Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/HgCloseHeadSelectionDialog.ui", "src/eric7/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui", + "src/eric7/Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui", "src/eric7/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui", "src/eric7/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui", "src/eric7/Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.ui", @@ -499,7 +500,7 @@ "src/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui", "src/eric7/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfConvertDataDialog.ui", "src/eric7/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfRevisionsInputDialog.ui", - "src/eric7/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/HgPurgeListDialog.ui", + "src/eric7/Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/HgPurgeListDialog.ui", "src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.ui", "src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesFoldDialog.ui", "src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesGuardsSelectionDialog.ui", @@ -511,11 +512,11 @@ "src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.ui", "src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesRenamePatchDialog.ui", "src/eric7/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui", - "src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui", - "src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui", - "src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelvesSelectionDialog.ui", - "src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui", - "src/eric7/Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui", + "src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui", + "src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui", + "src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelvesSelectionDialog.ui", + "src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui", + "src/eric7/Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui", "src/eric7/Plugins/VcsPlugins/vcsPySvn/ConfigurationPage/SubversionPage.ui", "src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.ui", "src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnChangeListsDialog.ui", @@ -1537,6 +1538,7 @@ "src/eric7/PipInterface/Ui_PipPackagesInputDialog.py", "src/eric7/PipInterface/Ui_PipPackagesWidget.py", "src/eric7/PipInterface/__init__.py", + "src/eric7/PipInterface/pipcleanup.py", "src/eric7/PipInterface/piplicenses.py", "src/eric7/PluginManager/PluginDetailsDialog.py", "src/eric7/PluginManager/PluginExceptions.py", @@ -1849,6 +1851,11 @@ "src/eric7/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py", "src/eric7/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/Ui_MercurialPage.py", "src/eric7/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/__init__.py", + "src/eric7/Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.py", + "src/eric7/Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py", + "src/eric7/Plugins/VcsPlugins/vcsMercurial/FastexportExtension/Ui_HgFastexportConfigDialog.py", + "src/eric7/Plugins/VcsPlugins/vcsMercurial/FastexportExtension/__init__.py", + "src/eric7/Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py", "src/eric7/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.py", "src/eric7/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py", "src/eric7/Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py", @@ -1921,11 +1928,11 @@ "src/eric7/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/largefiles.py", "src/eric7/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py", "src/eric7/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py", - "src/eric7/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/HgPurgeListDialog.py", - "src/eric7/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py", - "src/eric7/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/Ui_HgPurgeListDialog.py", - "src/eric7/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/__init__.py", - "src/eric7/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py", + "src/eric7/Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/HgPurgeListDialog.py", + "src/eric7/Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py", + "src/eric7/Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/Ui_HgPurgeListDialog.py", + "src/eric7/Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/__init__.py", + "src/eric7/Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/purge.py", "src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py", "src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesFoldDialog.py", "src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesGuardsSelectionDialog.py", @@ -1954,23 +1961,18 @@ "src/eric7/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/Ui_HgRebaseDialog.py", "src/eric7/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/__init__.py", "src/eric7/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py", - "src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py", - "src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.py", - "src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelvesSelectionDialog.py", - "src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.py", - "src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py", - "src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py", - "src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/Ui_HgShelveBrowserDialog.py", - "src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/Ui_HgShelveDataDialog.py", - "src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/Ui_HgShelvesSelectionDialog.py", - "src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/Ui_HgUnshelveDataDialog.py", - "src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/__init__.py", - "src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py", - "src/eric7/Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.py", - "src/eric7/Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py", - "src/eric7/Plugins/VcsPlugins/vcsMercurial/StripExtension/Ui_HgStripDialog.py", - "src/eric7/Plugins/VcsPlugins/vcsMercurial/StripExtension/__init__.py", - "src/eric7/Plugins/VcsPlugins/vcsMercurial/StripExtension/strip.py", + "src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py", + "src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.py", + "src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelvesSelectionDialog.py", + "src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.py", + "src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py", + "src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py", + "src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/Ui_HgShelveBrowserDialog.py", + "src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/Ui_HgShelveDataDialog.py", + "src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/Ui_HgShelvesSelectionDialog.py", + "src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/Ui_HgUnshelveDataDialog.py", + "src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/__init__.py", + "src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py", "src/eric7/Plugins/VcsPlugins/vcsMercurial/Ui_HgAddSubrepositoryDialog.py", "src/eric7/Plugins/VcsPlugins/vcsMercurial/Ui_HgAnnotateDialog.py", "src/eric7/Plugins/VcsPlugins/vcsMercurial/Ui_HgArchiveDialog.py", @@ -2008,6 +2010,12 @@ "src/eric7/Plugins/VcsPlugins/vcsMercurial/Ui_HgUserConfigDialog.py", "src/eric7/Plugins/VcsPlugins/vcsMercurial/Ui_HgUserConfigHostFingerprintDialog.py", "src/eric7/Plugins/VcsPlugins/vcsMercurial/Ui_HgUserConfigHostMinimumProtocolDialog.py", + "src/eric7/Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.py", + "src/eric7/Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py", + "src/eric7/Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py", + "src/eric7/Plugins/VcsPlugins/vcsMercurial/UncommitExtension/Ui_HgUncommitDialog.py", + "src/eric7/Plugins/VcsPlugins/vcsMercurial/UncommitExtension/__init__.py", + "src/eric7/Plugins/VcsPlugins/vcsMercurial/UncommitExtension/uncommit.py", "src/eric7/Plugins/VcsPlugins/vcsMercurial/__init__.py", "src/eric7/Plugins/VcsPlugins/vcsMercurial/hg.py", "src/eric7/Plugins/VcsPlugins/vcsPySvn/Config.py",
--- a/pyproject.toml Sat Nov 30 11:09:02 2024 +0100 +++ b/pyproject.toml Tue Jan 14 17:29:56 2025 +0100 @@ -85,11 +85,11 @@ "coverage>=6.5.0", "semver", "pipdeptree", - "watchdog>= 3.0.0", + "watchdog>=3.0.0", "psutil", "fido2", "requests", - "pyusb>= 1.2.0", + "pyusb>=1.2.0", "pywin32>=1.0;platform_system=='Windows'", "command-runner;platform_system=='Windows'", ]
--- a/scripts/cleanupSource.py Sat Nov 30 11:09:02 2024 +0100 +++ b/scripts/cleanupSource.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/scripts/compileUiFiles.py Sat Nov 30 11:09:02 2024 +0100 +++ b/scripts/compileUiFiles.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/scripts/create_windows_links.py Sat Nov 30 11:09:02 2024 +0100 +++ b/scripts/create_windows_links.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (c) 2018 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2018 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # # This is the install script for eric.
--- a/scripts/install-debugclients.py Sat Nov 30 11:09:02 2024 +0100 +++ b/scripts/install-debugclients.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # # This is the install script for the eric debug client. It may be used # to just install the debug clients for remote debugging.
--- a/scripts/install-dependencies.py Sat Nov 30 11:09:02 2024 +0100 +++ b/scripts/install-dependencies.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # # This script installs all packages eric depends on.
--- a/scripts/install-server.py Sat Nov 30 11:09:02 2024 +0100 +++ b/scripts/install-server.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (c) 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2024 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # # This is the install script for the eric-ide server. It may be used # to just install the server for remote editing and debugging.
--- a/scripts/install.py Sat Nov 30 11:09:02 2024 +0100 +++ b/scripts/install.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # # This is the install script for eric. @@ -305,9 +305,10 @@ # Mac OS X elif sys.platform == "darwin": major = sys.version_info.major - pyexec = "{0}/bin/pythonw{1}".format(sys.exec_prefix, major) + minor = sys.version_info.minor + pyexec = f"{sys.exec_prefix}/bin/pythonw{major}.{minor}" if not os.path.exists(pyexec): - pyexec = "{0}/bin/python{1}".format(sys.exec_prefix, major) + pyexec = f"{sys.exec_prefix}/bin/python{major}.{minor}" wname = wfile wrapper = ( """#!/bin/sh\n""" @@ -1237,7 +1238,7 @@ from eric7.__version__ import CopyrightShort, Version # noqa: I101 else: Version = "Unknown" - CopyrightShort = "(c) 2002 - 2024 Detlev Offenbach" + CopyrightShort = "(c) 2002 - 2025 Detlev Offenbach" copyToFile( os.path.join(directories["contents"], "Info.plist"),
--- a/scripts/uninstall-debugclients.py Sat Nov 30 11:09:02 2024 +0100 +++ b/scripts/uninstall-debugclients.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # # This is the uninstall script for the eric debug client. #
--- a/scripts/uninstall-server.py Sat Nov 30 11:09:02 2024 +0100 +++ b/scripts/uninstall-server.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (c) 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2024 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # # This is the uninstall script for the eric-ide server. #
--- a/scripts/uninstall.py Sat Nov 30 11:09:02 2024 +0100 +++ b/scripts/uninstall.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # # This is the uninstall script for eric. #
--- a/src/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/APIs/Python3/eric7.api Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/APIs/Python3/eric7.api Tue Jan 14 17:29:56 2025 +0100 @@ -435,11 +435,11 @@ eric7.DebugClients.Python.DebugUtilities.formatargvalues?4(args, varargs, varkw, localsDict, formatarg=str, formatvarargs=lambda name: "*" + name, formatvarkw=lambda name: "**" + name, formatvalue=lambda value: "=" + repr(value), ) eric7.DebugClients.Python.DebugUtilities.getargvalues?4(frame) eric7.DebugClients.Python.DebugUtilities.isExecutable?4(program) -eric7.DebugClients.Python.DebugUtilities.isPythonProgram?4(program) +eric7.DebugClients.Python.DebugUtilities.isPythonProgram?4(program, withPath=False) eric7.DebugClients.Python.DebugUtilities.isWindowsPlatform?4() eric7.DebugClients.Python.DebugUtilities.mod_dict?7 eric7.DebugClients.Python.DebugUtilities.patchArgumentStringWindows?4(debugClient, argStr) -eric7.DebugClients.Python.DebugUtilities.patchArguments?4(debugClient, arguments, noRedirect=False) +eric7.DebugClients.Python.DebugUtilities.patchArguments?4(debugClient, arguments, noRedirect=False, isPythonProg=False) eric7.DebugClients.Python.DebugUtilities.prepareJsonCommand?4(method, params) eric7.DebugClients.Python.DebugUtilities.quoteArgs?4(args) eric7.DebugClients.Python.DebugUtilities.removeQuotesFromArgs?4(args) @@ -3845,6 +3845,7 @@ eric7.PipInterface.Pip.Pip.installPyprojectDependencies?4(venvName) eric7.PipInterface.Pip.Pip.installRequirements?4(venvName) eric7.PipInterface.Pip.Pip.repairPip?4(venvName) +eric7.PipInterface.Pip.Pip.runCleanup?4(envName) eric7.PipInterface.Pip.Pip.runProcess?4(args, interpreter) eric7.PipInterface.Pip.Pip.showCacheInfo?4(venvName) eric7.PipInterface.Pip.Pip.shutdown?4() @@ -3910,14 +3911,13 @@ eric7.PipInterface.PipPackagesWidget.PipPackagesWidget.executeUninstallPackages?4(packages) eric7.PipInterface.PipPackagesWidget.PipPackagesWidget.executeUpgradePackages?4(packages) eric7.PipInterface.PipPackagesWidget.PipPackagesWidget.getPip?4() +eric7.PipInterface.PipPackagesWidget.PipPackagesWidget.on_cleanupButton_clicked?4() eric7.PipInterface.PipPackagesWidget.PipPackagesWidget.on_dependenciesList_itemActivated?4(item, column) eric7.PipInterface.PipPackagesWidget.PipPackagesWidget.on_dependenciesList_itemPressed?4(item, column) eric7.PipInterface.PipPackagesWidget.PipPackagesWidget.on_dependenciesList_itemSelectionChanged?4() eric7.PipInterface.PipPackagesWidget.PipPackagesWidget.on_dependencyRepairAllButton_clicked?4() eric7.PipInterface.PipPackagesWidget.PipPackagesWidget.on_dependencyRepairButton_clicked?4() eric7.PipInterface.PipPackagesWidget.PipPackagesWidget.on_environmentsComboBox_currentTextChanged?4(name) -eric7.PipInterface.PipPackagesWidget.PipPackagesWidget.on_installButton_clicked?4() -eric7.PipInterface.PipPackagesWidget.PipPackagesWidget.on_installUserSiteButton_clicked?4() eric7.PipInterface.PipPackagesWidget.PipPackagesWidget.on_installedFilesCheckBox_clicked?4(checked) eric7.PipInterface.PipPackagesWidget.PipPackagesWidget.on_localCheckBox_clicked?4() eric7.PipInterface.PipPackagesWidget.PipPackagesWidget.on_localDepCheckBox_clicked?4() @@ -3928,15 +3928,8 @@ eric7.PipInterface.PipPackagesWidget.PipPackagesWidget.on_refreshDependenciesButton_clicked?4() eric7.PipInterface.PipPackagesWidget.PipPackagesWidget.on_requiresButton_toggled?4(checked) eric7.PipInterface.PipPackagesWidget.PipPackagesWidget.on_searchButton_clicked?4() -eric7.PipInterface.PipPackagesWidget.PipPackagesWidget.on_searchMoreButton_clicked?4() -eric7.PipInterface.PipPackagesWidget.PipPackagesWidget.on_searchNameEdit_returnPressed?4() -eric7.PipInterface.PipPackagesWidget.PipPackagesWidget.on_searchNameEdit_textChanged?4(_txt) -eric7.PipInterface.PipPackagesWidget.PipPackagesWidget.on_searchResultList_itemActivated?4(item, column) -eric7.PipInterface.PipPackagesWidget.PipPackagesWidget.on_searchResultList_itemSelectionChanged?4() -eric7.PipInterface.PipPackagesWidget.PipPackagesWidget.on_searchToggleButton_1_toggled?4(checked) -eric7.PipInterface.PipPackagesWidget.PipPackagesWidget.on_searchToggleButton_2_toggled?4(checked) +eric7.PipInterface.PipPackagesWidget.PipPackagesWidget.on_searchEdit_returnPressed?4() eric7.PipInterface.PipPackagesWidget.PipPackagesWidget.on_showDepPackageDetailsButton_clicked?4() -eric7.PipInterface.PipPackagesWidget.PipPackagesWidget.on_showDetailsButton_clicked?4() eric7.PipInterface.PipPackagesWidget.PipPackagesWidget.on_showPackageDetailsButton_clicked?4() eric7.PipInterface.PipPackagesWidget.PipPackagesWidget.on_uninstallButton_clicked?4() eric7.PipInterface.PipPackagesWidget.PipPackagesWidget.on_upgradeAllButton_clicked?4() @@ -3949,12 +3942,6 @@ eric7.PipInterface.PipPackagesWidget.PipPackagesWidget.preferencesChanged?4() eric7.PipInterface.PipPackagesWidget.PipPackagesWidget.setVulnerabilityEnabled?4(enable) eric7.PipInterface.PipPackagesWidget.PipPackagesWidget?1(pip, parent=None) -eric7.PipInterface.PipPackagesWidget.PypiSearchResultsParser.ClassPrefix?7 -eric7.PipInterface.PipPackagesWidget.PypiSearchResultsParser.getResults?4() -eric7.PipInterface.PipPackagesWidget.PypiSearchResultsParser.handle_data?4(data) -eric7.PipInterface.PipPackagesWidget.PypiSearchResultsParser.handle_endtag?4(_tag) -eric7.PipInterface.PipPackagesWidget.PypiSearchResultsParser.handle_starttag?4(tag, attrs) -eric7.PipInterface.PipPackagesWidget.PypiSearchResultsParser?1(data) eric7.PipInterface.PipPackagesWindow.PipPackagesWindow.closeEvent?4(evt) eric7.PipInterface.PipPackagesWindow.PipPackagesWindow?1(parent=None) eric7.PipInterface.PipVulnerabilityChecker.Package.name?7 @@ -3973,6 +3960,7 @@ eric7.PipInterface.PipVulnerabilityChecker.VulnerabilityCheckError.FullDbUnavailable?7 eric7.PipInterface.PipVulnerabilityChecker.VulnerabilityCheckError.OK?7 eric7.PipInterface.PipVulnerabilityChecker.VulnerabilityCheckError.SummaryDbUnavailable?7 +eric7.PipInterface.pipcleanup.main?4() eric7.PipInterface.piplicenses.CompatibleArgumentParser._verify_args?5(args: CustomNamespace) eric7.PipInterface.piplicenses.CompatibleArgumentParser.parse_args?4(args: None | Sequence[str] = None, namespace: None | CustomNamespace = None, ) eric7.PipInterface.piplicenses.CustomHelpFormatter._expand_help?5(action: argparse.Action) @@ -5984,6 +5972,14 @@ eric7.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.MercurialPage.on_installButton_clicked?4() eric7.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.MercurialPage.save?4() eric7.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.MercurialPage?1(plugin) +eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.HgFastexportConfigDialog.HgFastexportConfigDialog.getData?4() +eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.HgFastexportConfigDialog.HgFastexportConfigDialog?1(revisions=None, parent=None) +eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.ProjectHelper.FastexportProjectHelper.initActions?4() +eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.ProjectHelper.FastexportProjectHelper.initMenu?4(mainMenu) +eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.ProjectHelper.FastexportProjectHelper.menuTitle?4() +eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.ProjectHelper.FastexportProjectHelper?1() +eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.fastexport.Fastexport.hgFastexport?4(revisions=None) +eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.fastexport.Fastexport?1(vcs, ui=None) eric7.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignDialog.HgGpgSignDialog.getData?4() eric7.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignDialog.HgGpgSignDialog?1(tagsList, branchesList, bookmarksList=None, parent=None) eric7.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignaturesDialog.HgGpgSignaturesDialog.closeEvent?4(e) @@ -6131,7 +6127,7 @@ eric7.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectBrowserHelper.HgExtensionProjectBrowserHelper._updateVCSStatus?5(name) eric7.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectBrowserHelper.HgExtensionProjectBrowserHelper.initMenus?4() eric7.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectBrowserHelper.HgExtensionProjectBrowserHelper.menuTitle?4() -eric7.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectBrowserHelper.HgExtensionProjectBrowserHelper.showExtensionMenu?4(key, controlled) +eric7.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectBrowserHelper.HgExtensionProjectBrowserHelper.showMenu?4(key, controlled) eric7.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectBrowserHelper.HgExtensionProjectBrowserHelper?1(vcsObject, browserObject, projectObject) eric7.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectHelper.HgExtensionProjectHelper.getActions?4() eric7.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectHelper.HgExtensionProjectHelper.initActions?4() @@ -6279,7 +6275,11 @@ eric7.Plugins.VcsPlugins.vcsMercurial.HgUtilities.getConfigPath?4() eric7.Plugins.VcsPlugins.vcsMercurial.HgUtilities.getHgExecutable?4() eric7.Plugins.VcsPlugins.vcsMercurial.HgUtilities.hgVersion?4(plugin) +eric7.Plugins.VcsPlugins.vcsMercurial.HgUtilities.isProgressInfo?4(line) +eric7.Plugins.VcsPlugins.vcsMercurial.HgUtilities.parseProgressInfo?4(progressLine) eric7.Plugins.VcsPlugins.vcsMercurial.HgUtilities.prepareProcess?4(proc, encoding="", language="") +eric7.Plugins.VcsPlugins.vcsMercurial.HgUtilities.progressRe?7 +eric7.Plugins.VcsPlugins.vcsMercurial.HgUtilities.versionRe?7 eric7.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditCommitEditor.HgHisteditCommitEditor.on_buttonBox_accepted?4() eric7.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditCommitEditor.HgHisteditCommitEditor.on_buttonBox_rejected?4() eric7.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditCommitEditor.HgHisteditCommitEditor.on_recentComboBox_activated?4(index) @@ -6315,7 +6315,7 @@ eric7.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.LfRevisionsInputDialog.LfRevisionsInputDialog?1(parent=None) eric7.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.ProjectBrowserHelper.LargefilesProjectBrowserHelper.initMenus?4() eric7.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.ProjectBrowserHelper.LargefilesProjectBrowserHelper.menuTitle?4() -eric7.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.ProjectBrowserHelper.LargefilesProjectBrowserHelper.showExtensionMenu?4(key, controlled) +eric7.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.ProjectBrowserHelper.LargefilesProjectBrowserHelper.showMenu?4(key, controlled) eric7.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.ProjectBrowserHelper.LargefilesProjectBrowserHelper?1(vcsObject, browserObject, projectObject) eric7.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.ProjectHelper.LargefilesProjectHelper.initActions?4() eric7.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.ProjectHelper.LargefilesProjectHelper.initMenu?4(mainMenu) @@ -6348,15 +6348,15 @@ eric7.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.HgProjectHelper.showMenu?4() eric7.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.HgProjectHelper.shutdown?4() eric7.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.HgProjectHelper?1(vcsObject, projectObject, parent=None, name=None) -eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.HgPurgeListDialog.HgPurgeListDialog?1(entries, parent=None) -eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.ProjectHelper.PurgeProjectHelper.initActions?4() -eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.ProjectHelper.PurgeProjectHelper.initMenu?4(mainMenu) -eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.ProjectHelper.PurgeProjectHelper.menuTitle?4() -eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.ProjectHelper.PurgeProjectHelper?1() -eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.purge.Purge.hgPurge?4(deleteAll=False) -eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.purge.Purge.hgPurgeList?4(deleteAll=False) -eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.purge.Purge.shutdown?4() -eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.purge.Purge?1(vcs, ui=None) +eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.HgPurgeListDialog.HgPurgeListDialog?1(entries, parent=None) +eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.ProjectHelper.PurgeProjectHelper.initActions?4() +eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.ProjectHelper.PurgeProjectHelper.initMenu?4(mainMenu) +eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.ProjectHelper.PurgeProjectHelper.menuTitle?4() +eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.ProjectHelper.PurgeProjectHelper?1() +eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.purge.Purge.hgPurge?4(deleteAll=False, ignoredOnly=False) +eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.purge.Purge.hgPurgeList?4(deleteAll=False, ignoredOnly=False) +eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.purge.Purge.shutdown?4() +eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.purge.Purge?1(vcs, ui=None) eric7.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesDefineGuardsDialog.HgQueuesDefineGuardsDialog.closeEvent?4(e) eric7.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesDefineGuardsDialog.HgQueuesDefineGuardsDialog.on_addButton_clicked?4() eric7.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesDefineGuardsDialog.HgQueuesDefineGuardsDialog.on_buttonBox_clicked?4(button) @@ -6461,49 +6461,54 @@ eric7.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.rebase.Rebase.hgRebaseAbort?4() eric7.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.rebase.Rebase.hgRebaseContinue?4() eric7.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.rebase.Rebase?1(vcs, ui=None) -eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.HgShelveBrowserDialog.AgeColumn?7 -eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.HgShelveBrowserDialog.MessageColumn?7 -eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.HgShelveBrowserDialog.NameColumn?7 -eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.HgShelveBrowserDialog.closeEvent?4(e) -eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.HgShelveBrowserDialog.on_buttonBox_clicked?4(button) -eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.HgShelveBrowserDialog.on_refreshButton_clicked?4() -eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.HgShelveBrowserDialog.on_shelveList_currentItemChanged?4(current, _previous) -eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.HgShelveBrowserDialog.on_shelveList_customContextMenuRequested?4(pos) -eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.HgShelveBrowserDialog.show?4() -eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.HgShelveBrowserDialog.start?4() -eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.HgShelveBrowserDialog?1(vcs, parent=None) -eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveDataDialog.HgShelveDataDialog.getData?4() -eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveDataDialog.HgShelveDataDialog?1(version, parent=None) -eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelvesSelectionDialog.HgShelvesSelectionDialog.getSelectedShelves?4() -eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelvesSelectionDialog.HgShelvesSelectionDialog.on_shelvesList_itemSelectionChanged?4() -eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelvesSelectionDialog.HgShelvesSelectionDialog?1(message, shelveNames, parent=None) -eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgUnshelveDataDialog.HgUnshelveDataDialog.getData?4() -eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgUnshelveDataDialog.HgUnshelveDataDialog?1(shelveNames, shelveName="", parent=None) -eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectBrowserHelper.ShelveProjectBrowserHelper.initMenus?4() -eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectBrowserHelper.ShelveProjectBrowserHelper.menuTitle?4() -eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectBrowserHelper.ShelveProjectBrowserHelper.showExtensionMenu?4(key, controlled) -eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectBrowserHelper.ShelveProjectBrowserHelper?1(vcsObject, browserObject, projectObject) -eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectHelper.ShelveProjectHelper.initActions?4() -eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectHelper.ShelveProjectHelper.initMenu?4(mainMenu) -eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectHelper.ShelveProjectHelper.menuTitle?4() -eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectHelper.ShelveProjectHelper?1() -eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.shelve.Shelve.hgCleanupShelves?4() -eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.shelve.Shelve.hgDeleteShelves?4(shelveNames=None) -eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.shelve.Shelve.hgShelve?4(name) -eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.shelve.Shelve.hgShelveBrowser?4() -eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.shelve.Shelve.hgUnshelve?4(shelveName="") -eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.shelve.Shelve.hgUnshelveAbort?4() -eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.shelve.Shelve.hgUnshelveContinue?4() -eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.shelve.Shelve.shutdown?4() -eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.shelve.Shelve?1(vcs, ui=None) -eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.HgStripDialog.HgStripDialog.getData?4() -eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.HgStripDialog.HgStripDialog?1(tagsList, branchesList, bookmarksList=None, rev="", parent=None) -eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.ProjectHelper.StripProjectHelper.initActions?4() -eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.ProjectHelper.StripProjectHelper.initMenu?4(mainMenu) -eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.ProjectHelper.StripProjectHelper.menuTitle?4() -eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.ProjectHelper.StripProjectHelper?1() -eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.strip.Strip.hgStrip?4(rev="") -eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.strip.Strip?1(vcs, ui=None) +eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveBrowserDialog.HgShelveBrowserDialog.AgeColumn?7 +eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveBrowserDialog.HgShelveBrowserDialog.MessageColumn?7 +eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveBrowserDialog.HgShelveBrowserDialog.NameColumn?7 +eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveBrowserDialog.HgShelveBrowserDialog.closeEvent?4(e) +eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveBrowserDialog.HgShelveBrowserDialog.on_buttonBox_clicked?4(button) +eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveBrowserDialog.HgShelveBrowserDialog.on_refreshButton_clicked?4() +eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveBrowserDialog.HgShelveBrowserDialog.on_shelveList_currentItemChanged?4(current, _previous) +eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveBrowserDialog.HgShelveBrowserDialog.on_shelveList_customContextMenuRequested?4(pos) +eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveBrowserDialog.HgShelveBrowserDialog.show?4() +eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveBrowserDialog.HgShelveBrowserDialog.start?4() +eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveBrowserDialog.HgShelveBrowserDialog?1(vcs, parent=None) +eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveDataDialog.HgShelveDataDialog.getData?4() +eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveDataDialog.HgShelveDataDialog?1(version, parent=None) +eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelvesSelectionDialog.HgShelvesSelectionDialog.getSelectedShelves?4() +eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelvesSelectionDialog.HgShelvesSelectionDialog.on_shelvesList_itemSelectionChanged?4() +eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelvesSelectionDialog.HgShelvesSelectionDialog?1(message, shelveNames, parent=None) +eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgUnshelveDataDialog.HgUnshelveDataDialog.getData?4() +eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgUnshelveDataDialog.HgUnshelveDataDialog?1(shelveNames, shelveName="", parent=None) +eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.ProjectBrowserHelper.ShelveProjectBrowserHelper.initMenus?4() +eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.ProjectBrowserHelper.ShelveProjectBrowserHelper.menuTitle?4() +eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.ProjectBrowserHelper.ShelveProjectBrowserHelper.showMenu?4(key, controlled) +eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.ProjectBrowserHelper.ShelveProjectBrowserHelper?1(vcsObject, browserObject, projectObject) +eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.ProjectHelper.ShelveProjectHelper.initActions?4() +eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.ProjectHelper.ShelveProjectHelper.initMenu?4(mainMenu) +eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.ProjectHelper.ShelveProjectHelper.menuTitle?4() +eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.ProjectHelper.ShelveProjectHelper?1() +eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.shelve.Shelve.hgCleanupShelves?4() +eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.shelve.Shelve.hgDeleteShelves?4(shelveNames=None) +eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.shelve.Shelve.hgShelve?4(name) +eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.shelve.Shelve.hgShelveBrowser?4() +eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.shelve.Shelve.hgUnshelve?4(shelveName="") +eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.shelve.Shelve.hgUnshelveAbort?4() +eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.shelve.Shelve.hgUnshelveContinue?4() +eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.shelve.Shelve.shutdown?4() +eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.shelve.Shelve?1(vcs, ui=None) +eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.HgUncommitDialog.HgUncommitDialog.getUncommitData?4() +eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.HgUncommitDialog.HgUncommitDialog.on_recentComboBox_activated?4(index) +eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.HgUncommitDialog.HgUncommitDialog?1(vcs, parent=None) +eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.ProjectBrowserHelper.UncommitProjectBrowserHelper.initMenus?4() +eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.ProjectBrowserHelper.UncommitProjectBrowserHelper.menuTitle?4() +eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.ProjectBrowserHelper.UncommitProjectBrowserHelper.showMenu?4(key, controlled) +eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.ProjectBrowserHelper.UncommitProjectBrowserHelper?1(vcsObject, browserObject, projectObject) +eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.ProjectHelper.UncommitProjectHelper.initActions?4() +eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.ProjectHelper.UncommitProjectHelper.initMenu?4(mainMenu) +eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.ProjectHelper.UncommitProjectHelper.menuTitle?4() +eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.ProjectHelper.UncommitProjectHelper?1() +eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.uncommit.Uncommit.hgUncommit?4(names=None) +eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.uncommit.Uncommit?1(vcs, ui=None) eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.IgnoreFileName?7 eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg._createStatusMonitorThread?5(interval, project) eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.activeExtensionsChanged?7 @@ -6512,6 +6517,7 @@ eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.canPush?4() eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.clearStatusCache?4() eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.committed?7 +eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.getBuiltinObject?4(builtinName) eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.getClient?4() eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.getEncoding?4() eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.getExtensionObject?4(extensionName) @@ -6560,7 +6566,7 @@ eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgOutgoing?4() eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgPhase?4(data=None) eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgPreviewBundle?4() -eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgPull?4(revisions=None) +eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgPull?4(revisions=None, noupdate=False) eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgPush?4(force=False, newBranch=False, rev=None) eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgReMerge?4(name) eric7.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgRecover?4() @@ -12361,6 +12367,7 @@ eric7.WebBrowser.FeaturePermissions.FeaturePermissionsDialog.FeaturePermissionsDialog.getData?4() eric7.WebBrowser.FeaturePermissions.FeaturePermissionsDialog.FeaturePermissionsDialog.on_removeAllButton_clicked?4() eric7.WebBrowser.FeaturePermissions.FeaturePermissionsDialog.FeaturePermissionsDialog.on_removeButton_clicked?4() +eric7.WebBrowser.FeaturePermissions.FeaturePermissionsDialog.FeaturePermissionsDialog.persistChanges?4() eric7.WebBrowser.FeaturePermissions.FeaturePermissionsDialog.FeaturePermissionsDialog?1(featurePermissions, parent=None) eric7.WebBrowser.Feeds.FeedEditDialog.FeedEditDialog.getData?4() eric7.WebBrowser.Feeds.FeedEditDialog.FeedEditDialog.on_titleEdit_textChanged?4(_txt) @@ -13371,6 +13378,7 @@ eric7.WebBrowser.WebBrowserLanguagesDialog.WebBrowserLanguagesDialog.on_upButton_clicked?4() eric7.WebBrowser.WebBrowserLanguagesDialog.WebBrowserLanguagesDialog?1(parent=None) eric7.WebBrowser.WebBrowserPage.SSL_AVAILABLE?7 +eric7.WebBrowser.WebBrowserPage.WebBrowserPage.PermissionTypeQuestions?7 eric7.WebBrowser.WebBrowserPage.WebBrowserPage.SafeJsWorld?7 eric7.WebBrowser.WebBrowserPage.WebBrowserPage.UnsafeJsWorld?7 eric7.WebBrowser.WebBrowserPage.WebBrowserPage.acceptNavigationRequest?4(url, type_, isMainFrame)
--- a/src/eric7/APIs/Python3/eric7.bas Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/APIs/Python3/eric7.bas Tue Jan 14 17:29:56 2025 +0100 @@ -382,6 +382,8 @@ ExporterRTF ExporterBase ExporterTEX ExporterBase ExternalJsObject QObject +Fastexport HgExtension +FastexportProjectHelper HgExtensionProjectHelper FavIconLabel QLabel FeaturePermissionBar EricAnimatedWidget FeaturePermissionManager QObject @@ -551,6 +553,7 @@ HgExtension QObject HgExtensionProjectBrowserHelper QObject HgExtensionProjectHelper QObject +HgFastexportConfigDialog QDialog Ui_HgFastexportConfigDialog HgGpgSignDialog QDialog Ui_HgGpgSignDialog HgGpgSignaturesDialog QDialog Ui_HgGpgSignaturesDialog HgGraftDialog QDialog Ui_HgGraftDialog @@ -590,11 +593,11 @@ HgShelvesSelectionDialog QDialog Ui_HgShelvesSelectionDialog HgStatusDialog QWidget Ui_HgStatusDialog HgStatusMonitorThread VcsStatusMonitorThread -HgStripDialog QDialog Ui_HgStripDialog HgSummaryDialog QDialog Ui_HgSummaryDialog HgTagBranchListDialog QDialog Ui_HgTagBranchListDialog HgTagDialog QDialog Ui_HgTagDialog HgTagOperation enum.Enum +HgUncommitDialog QDialog Ui_HgUncommitDialog HgUnshelveDataDialog QDialog Ui_HgUnshelveDataDialog HgUserConfigDialog QDialog Ui_HgUserConfigDialog HgUserConfigHostFingerprintDialog QDialog Ui_HgUserConfigHostFingerprintDialog @@ -917,7 +920,6 @@ PyRegExpWizardWidget QWidget Ui_PyRegExpWizardDialog PyRegExpWizardWindow EricMainWindow PySvnProjectHelper VcsProjectHelper -PypiSearchResultsParser html.parser.HTMLParser PytestExecutor TestExecutorBase PythonAstViewer QWidget PythonDisViewer QWidget Ui_PythonDisViewer @@ -1034,8 +1036,6 @@ StatusMonitorLed EricClickableLed StatusMonitorLedWidget QWidget StatusWidget QWidget -Strip HgExtension -StripProjectHelper HgExtensionProjectHelper SubstyleDefinitionDialog QDialog Ui_SubstyleDefinitionDialog SubstyledLexer Lexer Subversion VersionControl @@ -1145,6 +1145,9 @@ UMLItem QGraphicsRectItem UMLSceneSizeDialog QDialog Ui_UMLSceneSizeDialog UicCompilerOptionsDialog QDialog Ui_UicCompilerOptionsDialog +Uncommit HgExtension +UncommitProjectBrowserHelper HgExtensionProjectBrowserHelper +UncommitProjectHelper HgExtensionProjectHelper UnittestExecutor TestExecutorBase UnknownDevicesDialog QDialog Ui_UnknownDevicesDialog UrlBar EricClearableLineEdit
--- a/src/eric7/CodeFormatting/BlackConfigurationDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/CodeFormatting/BlackConfigurationDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/CodeFormatting/BlackFormattingAction.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/CodeFormatting/BlackFormattingAction.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/CodeFormatting/BlackFormattingDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/CodeFormatting/BlackFormattingDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/CodeFormatting/BlackUtilities.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/CodeFormatting/BlackUtilities.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/CodeFormatting/FormattingDiffWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/CodeFormatting/FormattingDiffWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/CodeFormatting/IsortConfigurationDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/CodeFormatting/IsortConfigurationDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/CodeFormatting/IsortFormattingAction.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/CodeFormatting/IsortFormattingAction.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/CodeFormatting/IsortFormattingDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/CodeFormatting/IsortFormattingDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/CodeFormatting/IsortUtilities.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/CodeFormatting/IsortUtilities.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/CodeFormatting/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/CodeFormatting/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/CondaInterface/Conda.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/CondaInterface/Conda.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/CondaInterface/CondaExecDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/CondaInterface/CondaExecDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/CondaInterface/CondaExportDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/CondaInterface/CondaExportDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/CondaInterface/CondaInfoDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/CondaInterface/CondaInfoDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/CondaInterface/CondaNewEnvironmentDataDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/CondaInterface/CondaNewEnvironmentDataDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/CondaInterface/CondaPackageDetailsWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/CondaInterface/CondaPackageDetailsWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/CondaInterface/CondaPackagesWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/CondaInterface/CondaPackagesWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/CondaInterface/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/CondaInterface/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Cooperation/ChatWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Cooperation/ChatWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Cooperation/Connection.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Cooperation/Connection.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Cooperation/CooperationClient.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Cooperation/CooperationClient.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Cooperation/CooperationServer.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Cooperation/CooperationServer.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Cooperation/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Cooperation/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/CycloneDXInterface/CycloneDXConfigDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/CycloneDXInterface/CycloneDXConfigDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/CycloneDXInterface/CycloneDXMetaDataDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/CycloneDXInterface/CycloneDXMetaDataDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/CycloneDXInterface/CycloneDXUtilities.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/CycloneDXInterface/CycloneDXUtilities.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/CycloneDXInterface/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/CycloneDXInterface/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/DataViews/CodeMetrics.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/DataViews/CodeMetrics.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # #
--- a/src/eric7/DataViews/CodeMetricsDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/DataViews/CodeMetricsDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/DataViews/PyCoverageDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/DataViews/PyCoverageDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/DataViews/PyCoverageHtmlReportDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/DataViews/PyCoverageHtmlReportDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/DataViews/PyCoverageJsonReportDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/DataViews/PyCoverageJsonReportDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/DataViews/PyProfileDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/DataViews/PyProfileDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/DataViews/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/DataViews/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/DebugClients/Python/AsyncFile.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/DebugClients/Python/AsyncFile.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/DebugClients/Python/BreakpointWatch.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/DebugClients/Python/BreakpointWatch.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/DebugClients/Python/DebugBase.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/DebugClients/Python/DebugBase.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/DebugClients/Python/DebugClient.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/DebugClients/Python/DebugClient.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/DebugClients/Python/DebugClientBase.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/DebugClients/Python/DebugClientBase.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/DebugClients/Python/DebugClientCapabilities.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/DebugClients/Python/DebugClientCapabilities.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2005 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2005 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/DebugClients/Python/DebugConfig.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/DebugClients/Python/DebugConfig.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2005 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2005 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/DebugClients/Python/DebugUtilities.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/DebugClients/Python/DebugUtilities.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -9,6 +9,7 @@ import json import os +import shutil import sys import traceback @@ -216,13 +217,16 @@ return False -def isPythonProgram(program): +def isPythonProgram(program, withPath=False): """ Function to check, if the given program is a Python interpreter or program. @param program program to be checked @type str + @param withPath flag indicating to search the program in the executable + search path (defaults to False) + @type bool (optional) @return flag indicating a Python interpreter or program @rtype bool """ @@ -233,6 +237,11 @@ if any(pyname in prog for pyname in PYTHON_NAMES): return True + if withPath: + prog = shutil.which(program) + if prog: + program = prog + return ( not isWindowsPlatform() and isExecutable(program) and startsWithShebang(program) ) @@ -283,7 +292,7 @@ return args -def patchArguments(debugClient, arguments, noRedirect=False): +def patchArguments(debugClient, arguments, noRedirect=False, isPythonProg=False): """ Function to patch the arguments given to start a program in order to execute it in our debugger. @@ -293,11 +302,14 @@ @param arguments list of program arguments @type list of str @param noRedirect flag indicating to not redirect stdin and stdout - @type bool + (defaults to False) + @type bool (optional) + @param isPythonProg flag indicating a Python script (defaults to False) + @type bool (optional) @return modified argument list @rtype list of str """ - if not isPythonProgram(arguments[0]): + if not (isPythonProg or isPythonProgram(arguments[0])): # it is not a Python program return arguments
--- a/src/eric7/DebugClients/Python/DebugVariables.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/DebugClients/Python/DebugVariables.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/DebugClients/Python/FlexCompleter.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/DebugClients/Python/FlexCompleter.py Tue Jan 14 17:29:56 2025 +0100 @@ -83,8 +83,12 @@ @exception TypeError raised to indicate a wrong data structure of the namespace object """ - if namespace and not isinstance(namespace, (dict, sys._getframe().f_locals.__class__)): - raise TypeError("namespace must be a dictionary or since 3.13 a FrameLocalsProxy") + if namespace and not isinstance( + namespace, (dict, sys._getframe().f_locals.__class__) + ): + raise TypeError( + "namespace must be a dictionary or since 3.13 a FrameLocalsProxy" + ) # Don't bind to namespace quite yet, but flag whether the user wants a # specific namespace or to use __main__.__dict__. This will allow us
--- a/src/eric7/DebugClients/Python/ModuleLoader.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/DebugClients/Python/ModuleLoader.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/DebugClients/Python/MultiProcessDebugExtension.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/DebugClients/Python/MultiProcessDebugExtension.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/DebugClients/Python/MultiprocessingExtension.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/DebugClients/Python/MultiprocessingExtension.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/DebugClients/Python/PyProfile.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/DebugClients/Python/PyProfile.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> """ Module defining additions to the standard Python profile.py.
--- a/src/eric7/DebugClients/Python/QProcessExtension.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/DebugClients/Python/QProcessExtension.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/DebugClients/Python/SubprocessExtension.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/DebugClients/Python/SubprocessExtension.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -10,6 +10,7 @@ import os import shlex +import shutil from DebugUtilities import ( isPythonProgram, @@ -55,22 +56,37 @@ ): if isinstance(args, str): # convert to arguments list - args = ( + args_list = ( stringToArgumentsWindows(args) if isWindowsPlatform() else shlex.split(args) ) else: # create a copy of the arguments - args = args[:] - ok = isPythonProgram(args[0]) - if ok: - scriptName = os.path.basename(args[0]) + args_list = args[:] + isPythonProg = isPythonProgram( + args_list[0], + withPath="shell" in kwargs and kwargs["shell"] is True, + ) + if isPythonProg: + scriptName = os.path.basename(args_list[0]) if not _debugClient.skipMultiProcessDebugging(scriptName): - args = patchArguments(_debugClient, args, noRedirect=True) - if "shell" in kwargs and kwargs["shell"] is True: - # shell=True interferes with eric debugger - kwargs["shell"] = False + if ( + "shell" in kwargs + and kwargs["shell"] is True + and not os.path.isabs(args_list[0]) + ): + prog = shutil.which(args_list[0]) + if prog: + args_list[0] = prog + args = patchArguments( + _debugClient, + args_list, + noRedirect=True, + isPythonProg=isPythonProg, + ) + if "shell" in kwargs and kwargs["shell"] is True: + args = shlex.join(args) super().__init__(args, *popenargs, **kwargs)
--- a/src/eric7/DebugClients/Python/ThreadExtension.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/DebugClients/Python/ThreadExtension.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/DebugClients/Python/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/DebugClients/Python/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2005 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2005 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/DebugClients/Python/eric7dbgstub.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/DebugClients/Python/eric7dbgstub.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/DebugClients/Python/getpass.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/DebugClients/Python/getpass.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2004 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2004 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/DebugClients/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/DebugClients/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2005 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2005 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Debugger/BreakPointModel.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Debugger/BreakPointModel.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -289,9 +289,12 @@ """ # eliminate redundant break points newBreakpoints = [] - for breakpoint in breakpoints: - if breakpoint not in self.breakpoints and breakpoint not in newBreakpoints: - newBreakpoints.append(breakpoint) + for breakpointToAdd in breakpoints: + if ( + breakpointToAdd not in self.breakpoints + and breakpointToAdd not in newBreakpoints + ): + newBreakpoints.append(breakpointToAdd) if newBreakpoints: cnt = len(self.breakpoints)
--- a/src/eric7/Debugger/BreakPointViewer.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Debugger/BreakPointViewer.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2005 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2005 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Debugger/CallStackViewer.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Debugger/CallStackViewer.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2013 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2013 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Debugger/CallTraceViewer.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Debugger/CallTraceViewer.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Debugger/Config.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Debugger/Config.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Debugger/DebugClientCapabilities.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Debugger/DebugClientCapabilities.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Debugger/DebugServer.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Debugger/DebugServer.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Debugger/DebugUI.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Debugger/DebugUI.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Debugger/DebugViewer.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Debugger/DebugViewer.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Debugger/DebuggerInterfaceNone.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Debugger/DebuggerInterfaceNone.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Debugger/DebuggerInterfacePython.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Debugger/DebuggerInterfacePython.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -910,7 +910,8 @@ sock = self.__pendingConnections.pop() self.__shutdownSocket(sock) - self.__ericServerDebuggerInterface.stopClient() + if self.__ericServerDebuggerInterface is not None: + self.__ericServerDebuggerInterface.stopClient() # reinitialize self.__commandQueue.clear()
--- a/src/eric7/Debugger/EditBreakpointDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Debugger/EditBreakpointDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Debugger/EditWatchpointDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Debugger/EditWatchpointDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Debugger/ExceptionLogger.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Debugger/ExceptionLogger.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Debugger/ExceptionsFilterDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Debugger/ExceptionsFilterDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Debugger/StartDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Debugger/StartDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Debugger/StartHistoryEditDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Debugger/StartHistoryEditDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Debugger/VariableDetailDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Debugger/VariableDetailDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Debugger/VariablesFilterDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Debugger/VariablesFilterDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Debugger/VariablesViewer.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Debugger/VariablesViewer.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Debugger/WatchPointModel.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Debugger/WatchPointModel.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Debugger/WatchPointViewer.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Debugger/WatchPointViewer.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2005 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2005 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Debugger/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Debugger/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Documentation/Help/source.qhp Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Documentation/Help/source.qhp Tue Jan 14 17:29:56 2025 +0100 @@ -390,6 +390,7 @@ <section title="eric7.PipInterface.PipPackagesWidget" ref="eric7.PipInterface.PipPackagesWidget.html" /> <section title="eric7.PipInterface.PipPackagesWindow" ref="eric7.PipInterface.PipPackagesWindow.html" /> <section title="eric7.PipInterface.PipVulnerabilityChecker" ref="eric7.PipInterface.PipVulnerabilityChecker.html" /> + <section title="eric7.PipInterface.pipcleanup" ref="eric7.PipInterface.pipcleanup.html" /> <section title="eric7.PipInterface.piplicenses" ref="eric7.PipInterface.piplicenses.html" /> </section> <section title="eric7.PluginManager" ref="index-eric7.PluginManager.html"> @@ -641,6 +642,11 @@ <section title="eric7.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage" ref="index-eric7.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.html"> <section title="eric7.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.html" /> </section> + <section title="eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension" ref="index-eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.html"> + <section title="eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.HgFastexportConfigDialog" ref="eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.HgFastexportConfigDialog.html" /> + <section title="eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.ProjectHelper" ref="eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.ProjectHelper.html" /> + <section title="eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.fastexport" ref="eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.fastexport.html" /> + </section> <section title="eric7.Plugins.VcsPlugins.vcsMercurial.GpgExtension" ref="index-eric7.Plugins.VcsPlugins.vcsMercurial.GpgExtension.html"> <section title="eric7.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignDialog" ref="eric7.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignDialog.html" /> <section title="eric7.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignaturesDialog" ref="eric7.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignaturesDialog.html" /> @@ -663,10 +669,10 @@ <section title="eric7.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.__init__" ref="eric7.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.__init__.html" /> <section title="eric7.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.largefiles" ref="eric7.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.largefiles.html" /> </section> - <section title="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension" ref="index-eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.html"> - <section title="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.HgPurgeListDialog" ref="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.HgPurgeListDialog.html" /> - <section title="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.ProjectHelper" ref="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.ProjectHelper.html" /> - <section title="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.purge" ref="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.purge.html" /> + <section title="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin" ref="index-eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.html"> + <section title="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.HgPurgeListDialog" ref="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.HgPurgeListDialog.html" /> + <section title="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.ProjectHelper" ref="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.ProjectHelper.html" /> + <section title="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.purge" ref="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.purge.html" /> </section> <section title="eric7.Plugins.VcsPlugins.vcsMercurial.QueuesExtension" ref="index-eric7.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.html"> <section title="eric7.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesDefineGuardsDialog" ref="eric7.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesDefineGuardsDialog.html" /> @@ -687,19 +693,20 @@ <section title="eric7.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.ProjectHelper" ref="eric7.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.ProjectHelper.html" /> <section title="eric7.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.rebase" ref="eric7.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.rebase.html" /> </section> - <section title="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension" ref="index-eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.html"> - <section title="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.html" /> - <section title="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveDataDialog" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveDataDialog.html" /> - <section title="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelvesSelectionDialog" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelvesSelectionDialog.html" /> - <section title="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgUnshelveDataDialog" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgUnshelveDataDialog.html" /> - <section title="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectBrowserHelper" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectBrowserHelper.html" /> - <section title="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectHelper" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectHelper.html" /> - <section title="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.shelve" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.shelve.html" /> + <section title="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin" ref="index-eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.html"> + <section title="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveBrowserDialog" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveBrowserDialog.html" /> + <section title="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveDataDialog" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveDataDialog.html" /> + <section title="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelvesSelectionDialog" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelvesSelectionDialog.html" /> + <section title="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgUnshelveDataDialog" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgUnshelveDataDialog.html" /> + <section title="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.ProjectBrowserHelper" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.ProjectBrowserHelper.html" /> + <section title="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.ProjectHelper" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.ProjectHelper.html" /> + <section title="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.shelve" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.shelve.html" /> </section> - <section title="eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension" ref="index-eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.html"> - <section title="eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.HgStripDialog" ref="eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.HgStripDialog.html" /> - <section title="eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.ProjectHelper" ref="eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.ProjectHelper.html" /> - <section title="eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.strip" ref="eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.strip.html" /> + <section title="eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension" ref="index-eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.html"> + <section title="eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.HgUncommitDialog" ref="eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.HgUncommitDialog.html" /> + <section title="eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.ProjectBrowserHelper" ref="eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.ProjectBrowserHelper.html" /> + <section title="eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.ProjectHelper" ref="eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.ProjectHelper.html" /> + <section title="eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.uncommit" ref="eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.uncommit.html" /> </section> <section title="eric7.Plugins.VcsPlugins.vcsMercurial.Config" ref="eric7.Plugins.VcsPlugins.vcsMercurial.Config.html" /> <section title="eric7.Plugins.VcsPlugins.vcsMercurial.HgAddSubrepositoryDialog" ref="eric7.Plugins.VcsPlugins.vcsMercurial.HgAddSubrepositoryDialog.html" /> @@ -6982,6 +6989,18 @@ <keyword name="ExternalJsObject.speedDial" id="ExternalJsObject.speedDial" ref="eric7.WebBrowser.JavaScript.ExternalJsObject.html#ExternalJsObject.speedDial" /> <keyword name="ExternalJsObject.startPage" id="ExternalJsObject.startPage" ref="eric7.WebBrowser.JavaScript.ExternalJsObject.html#ExternalJsObject.startPage" /> <keyword name="ExternalJsObject.unregisterExtraObject" id="ExternalJsObject.unregisterExtraObject" ref="eric7.WebBrowser.JavaScript.ExternalJsObject.html#ExternalJsObject.unregisterExtraObject" /> + <keyword name="Fastexport" id="Fastexport" ref="eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.fastexport.html#Fastexport" /> + <keyword name="Fastexport (Constructor)" id="Fastexport (Constructor)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.fastexport.html#Fastexport.__init__" /> + <keyword name="Fastexport.__processFinished" id="Fastexport.__processFinished" ref="eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.fastexport.html#Fastexport.__processFinished" /> + <keyword name="Fastexport.__readStderr" id="Fastexport.__readStderr" ref="eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.fastexport.html#Fastexport.__readStderr" /> + <keyword name="Fastexport.hgFastexport" id="Fastexport.hgFastexport" ref="eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.fastexport.html#Fastexport.hgFastexport" /> + <keyword name="FastexportExtension (Package)" id="FastexportExtension (Package)" ref="index-eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.html" /> + <keyword name="FastexportProjectHelper" id="FastexportProjectHelper" ref="eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.ProjectHelper.html#FastexportProjectHelper" /> + <keyword name="FastexportProjectHelper (Constructor)" id="FastexportProjectHelper (Constructor)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.ProjectHelper.html#FastexportProjectHelper.__init__" /> + <keyword name="FastexportProjectHelper.__hgFastexport" id="FastexportProjectHelper.__hgFastexport" ref="eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.ProjectHelper.html#FastexportProjectHelper.__hgFastexport" /> + <keyword name="FastexportProjectHelper.initActions" id="FastexportProjectHelper.initActions" ref="eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.ProjectHelper.html#FastexportProjectHelper.initActions" /> + <keyword name="FastexportProjectHelper.initMenu" id="FastexportProjectHelper.initMenu" ref="eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.ProjectHelper.html#FastexportProjectHelper.initMenu" /> + <keyword name="FastexportProjectHelper.menuTitle" id="FastexportProjectHelper.menuTitle" ref="eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.ProjectHelper.html#FastexportProjectHelper.menuTitle" /> <keyword name="FavIconLabel" id="FavIconLabel" ref="eric7.WebBrowser.UrlBar.FavIconLabel.html#FavIconLabel" /> <keyword name="FavIconLabel (Constructor)" id="FavIconLabel (Constructor)" ref="eric7.WebBrowser.UrlBar.FavIconLabel.html#FavIconLabel.__init__" /> <keyword name="FavIconLabel (Module)" id="FavIconLabel (Module)" ref="eric7.WebBrowser.UrlBar.FavIconLabel.html" /> @@ -7012,11 +7031,14 @@ <keyword name="FeaturePermissionsDialog (Constructor)" id="FeaturePermissionsDialog (Constructor)" ref="eric7.WebBrowser.FeaturePermissions.FeaturePermissionsDialog.html#FeaturePermissionsDialog.__init__" /> <keyword name="FeaturePermissionsDialog (Module)" id="FeaturePermissionsDialog (Module)" ref="eric7.WebBrowser.FeaturePermissions.FeaturePermissionsDialog.html" /> <keyword name="FeaturePermissionsDialog.__currentTabChanged" id="FeaturePermissionsDialog.__currentTabChanged" ref="eric7.WebBrowser.FeaturePermissions.FeaturePermissionsDialog.html#FeaturePermissionsDialog.__currentTabChanged" /> + <keyword name="FeaturePermissionsDialog.__initializePermissionsList_qt67" id="FeaturePermissionsDialog.__initializePermissionsList_qt67" ref="eric7.WebBrowser.FeaturePermissions.FeaturePermissionsDialog.html#FeaturePermissionsDialog.__initializePermissionsList_qt67" /> + <keyword name="FeaturePermissionsDialog.__initializePermissionsList_qt68" id="FeaturePermissionsDialog.__initializePermissionsList_qt68" ref="eric7.WebBrowser.FeaturePermissions.FeaturePermissionsDialog.html#FeaturePermissionsDialog.__initializePermissionsList_qt68" /> <keyword name="FeaturePermissionsDialog.__itemSelectionChanged" id="FeaturePermissionsDialog.__itemSelectionChanged" ref="eric7.WebBrowser.FeaturePermissions.FeaturePermissionsDialog.html#FeaturePermissionsDialog.__itemSelectionChanged" /> <keyword name="FeaturePermissionsDialog.__updateButtons" id="FeaturePermissionsDialog.__updateButtons" ref="eric7.WebBrowser.FeaturePermissions.FeaturePermissionsDialog.html#FeaturePermissionsDialog.__updateButtons" /> <keyword name="FeaturePermissionsDialog.getData" id="FeaturePermissionsDialog.getData" ref="eric7.WebBrowser.FeaturePermissions.FeaturePermissionsDialog.html#FeaturePermissionsDialog.getData" /> <keyword name="FeaturePermissionsDialog.on_removeAllButton_clicked" id="FeaturePermissionsDialog.on_removeAllButton_clicked" ref="eric7.WebBrowser.FeaturePermissions.FeaturePermissionsDialog.html#FeaturePermissionsDialog.on_removeAllButton_clicked" /> <keyword name="FeaturePermissionsDialog.on_removeButton_clicked" id="FeaturePermissionsDialog.on_removeButton_clicked" ref="eric7.WebBrowser.FeaturePermissions.FeaturePermissionsDialog.html#FeaturePermissionsDialog.on_removeButton_clicked" /> + <keyword name="FeaturePermissionsDialog.persistChanges" id="FeaturePermissionsDialog.persistChanges" ref="eric7.WebBrowser.FeaturePermissions.FeaturePermissionsDialog.html#FeaturePermissionsDialog.persistChanges" /> <keyword name="FeedEditDialog" id="FeedEditDialog" ref="eric7.WebBrowser.Feeds.FeedEditDialog.html#FeedEditDialog" /> <keyword name="FeedEditDialog (Constructor)" id="FeedEditDialog (Constructor)" ref="eric7.WebBrowser.Feeds.FeedEditDialog.html#FeedEditDialog.__init__" /> <keyword name="FeedEditDialog (Module)" id="FeedEditDialog (Module)" ref="eric7.WebBrowser.Feeds.FeedEditDialog.html" /> @@ -8964,6 +8986,7 @@ <keyword name="Hg.canPull" id="Hg.canPull" ref="eric7.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.canPull" /> <keyword name="Hg.canPush" id="Hg.canPush" ref="eric7.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.canPush" /> <keyword name="Hg.clearStatusCache" id="Hg.clearStatusCache" ref="eric7.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.clearStatusCache" /> + <keyword name="Hg.getBuiltinObject" id="Hg.getBuiltinObject" ref="eric7.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.getBuiltinObject" /> <keyword name="Hg.getClient" id="Hg.getClient" ref="eric7.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.getClient" /> <keyword name="Hg.getEncoding" id="Hg.getEncoding" ref="eric7.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.getEncoding" /> <keyword name="Hg.getExtensionObject" id="Hg.getExtensionObject" ref="eric7.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.getExtensionObject" /> @@ -9290,7 +9313,7 @@ <keyword name="HgExtensionProjectBrowserHelper._updateVCSStatus" id="HgExtensionProjectBrowserHelper._updateVCSStatus" ref="eric7.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectBrowserHelper.html#HgExtensionProjectBrowserHelper._updateVCSStatus" /> <keyword name="HgExtensionProjectBrowserHelper.initMenus" id="HgExtensionProjectBrowserHelper.initMenus" ref="eric7.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectBrowserHelper.html#HgExtensionProjectBrowserHelper.initMenus" /> <keyword name="HgExtensionProjectBrowserHelper.menuTitle" id="HgExtensionProjectBrowserHelper.menuTitle" ref="eric7.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectBrowserHelper.html#HgExtensionProjectBrowserHelper.menuTitle" /> - <keyword name="HgExtensionProjectBrowserHelper.showExtensionMenu" id="HgExtensionProjectBrowserHelper.showExtensionMenu" ref="eric7.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectBrowserHelper.html#HgExtensionProjectBrowserHelper.showExtensionMenu" /> + <keyword name="HgExtensionProjectBrowserHelper.showMenu" id="HgExtensionProjectBrowserHelper.showMenu" ref="eric7.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectBrowserHelper.html#HgExtensionProjectBrowserHelper.showMenu" /> <keyword name="HgExtensionProjectHelper" id="HgExtensionProjectHelper" ref="eric7.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectHelper.html#HgExtensionProjectHelper" /> <keyword name="HgExtensionProjectHelper (Constructor)" id="HgExtensionProjectHelper (Constructor)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectHelper.html#HgExtensionProjectHelper.__init__" /> <keyword name="HgExtensionProjectHelper (Module)" id="HgExtensionProjectHelper (Module)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectHelper.html" /> @@ -9300,6 +9323,11 @@ <keyword name="HgExtensionProjectHelper.menuTitle" id="HgExtensionProjectHelper.menuTitle" ref="eric7.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectHelper.html#HgExtensionProjectHelper.menuTitle" /> <keyword name="HgExtensionProjectHelper.setObjects" id="HgExtensionProjectHelper.setObjects" ref="eric7.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectHelper.html#HgExtensionProjectHelper.setObjects" /> <keyword name="HgExtensionProjectHelper.shutdown" id="HgExtensionProjectHelper.shutdown" ref="eric7.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectHelper.html#HgExtensionProjectHelper.shutdown" /> + <keyword name="HgFastexportConfigDialog" id="HgFastexportConfigDialog" ref="eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.HgFastexportConfigDialog.html#HgFastexportConfigDialog" /> + <keyword name="HgFastexportConfigDialog (Constructor)" id="HgFastexportConfigDialog (Constructor)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.HgFastexportConfigDialog.html#HgFastexportConfigDialog.__init__" /> + <keyword name="HgFastexportConfigDialog (Module)" id="HgFastexportConfigDialog (Module)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.HgFastexportConfigDialog.html" /> + <keyword name="HgFastexportConfigDialog.__updateOK" id="HgFastexportConfigDialog.__updateOK" ref="eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.HgFastexportConfigDialog.html#HgFastexportConfigDialog.__updateOK" /> + <keyword name="HgFastexportConfigDialog.getData" id="HgFastexportConfigDialog.getData" ref="eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.HgFastexportConfigDialog.html#HgFastexportConfigDialog.getData" /> <keyword name="HgGpgSignDialog" id="HgGpgSignDialog" ref="eric7.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignDialog.html#HgGpgSignDialog" /> <keyword name="HgGpgSignDialog (Constructor)" id="HgGpgSignDialog (Constructor)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignDialog.html#HgGpgSignDialog.__init__" /> <keyword name="HgGpgSignDialog (Module)" id="HgGpgSignDialog (Module)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignDialog.html" /> @@ -9492,7 +9520,9 @@ <keyword name="HgProjectBrowserHelper.__HgSbsDiff" id="HgProjectBrowserHelper.__HgSbsDiff" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__HgSbsDiff" /> <keyword name="HgProjectBrowserHelper.__HgSbsExtendedDiff" id="HgProjectBrowserHelper.__HgSbsExtendedDiff" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__HgSbsExtendedDiff" /> <keyword name="HgProjectBrowserHelper.__HgUnresolved" id="HgProjectBrowserHelper.__HgUnresolved" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__HgUnresolved" /> + <keyword name="HgProjectBrowserHelper.__addBuiltinsMenu" id="HgProjectBrowserHelper.__addBuiltinsMenu" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__addBuiltinsMenu" /> <keyword name="HgProjectBrowserHelper.__addExtensionsMenu" id="HgProjectBrowserHelper.__addExtensionsMenu" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__addExtensionsMenu" /> + <keyword name="HgProjectBrowserHelper.__showBuiltinsMenu" id="HgProjectBrowserHelper.__showBuiltinsMenu" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__showBuiltinsMenu" /> <keyword name="HgProjectBrowserHelper.__showExtensionMenu" id="HgProjectBrowserHelper.__showExtensionMenu" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__showExtensionMenu" /> <keyword name="HgProjectBrowserHelper.__skipListFileName" id="HgProjectBrowserHelper.__skipListFileName" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper.__skipListFileName" /> <keyword name="HgProjectBrowserHelper._addVCSMenu" id="HgProjectBrowserHelper._addVCSMenu" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html#HgProjectBrowserHelper._addVCSMenu" /> @@ -9582,9 +9612,9 @@ <keyword name="HgProjectHelper.setObjects" id="HgProjectHelper.setObjects" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.setObjects" /> <keyword name="HgProjectHelper.showMenu" id="HgProjectHelper.showMenu" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.showMenu" /> <keyword name="HgProjectHelper.shutdown" id="HgProjectHelper.shutdown" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.shutdown" /> - <keyword name="HgPurgeListDialog" id="HgPurgeListDialog" ref="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.HgPurgeListDialog.html#HgPurgeListDialog" /> - <keyword name="HgPurgeListDialog (Constructor)" id="HgPurgeListDialog (Constructor)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.HgPurgeListDialog.html#HgPurgeListDialog.__init__" /> - <keyword name="HgPurgeListDialog (Module)" id="HgPurgeListDialog (Module)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.HgPurgeListDialog.html" /> + <keyword name="HgPurgeListDialog" id="HgPurgeListDialog" ref="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.HgPurgeListDialog.html#HgPurgeListDialog" /> + <keyword name="HgPurgeListDialog (Constructor)" id="HgPurgeListDialog (Constructor)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.HgPurgeListDialog.html#HgPurgeListDialog.__init__" /> + <keyword name="HgPurgeListDialog (Module)" id="HgPurgeListDialog (Module)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.HgPurgeListDialog.html" /> <keyword name="HgQueuesDefineGuardsDialog" id="HgQueuesDefineGuardsDialog" ref="eric7.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesDefineGuardsDialog.html#HgQueuesDefineGuardsDialog" /> <keyword name="HgQueuesDefineGuardsDialog (Constructor)" id="HgQueuesDefineGuardsDialog (Constructor)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesDefineGuardsDialog.html#HgQueuesDefineGuardsDialog.__init__" /> <keyword name="HgQueuesDefineGuardsDialog (Module)" id="HgQueuesDefineGuardsDialog (Module)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesDefineGuardsDialog.html" /> @@ -9717,35 +9747,35 @@ <keyword name="HgServeDialog.__startServer" id="HgServeDialog.__startServer" ref="eric7.Plugins.VcsPlugins.vcsMercurial.HgServeDialog.html#HgServeDialog.__startServer" /> <keyword name="HgServeDialog.__stopServer" id="HgServeDialog.__stopServer" ref="eric7.Plugins.VcsPlugins.vcsMercurial.HgServeDialog.html#HgServeDialog.__stopServer" /> <keyword name="HgServeDialog.closeEvent" id="HgServeDialog.closeEvent" ref="eric7.Plugins.VcsPlugins.vcsMercurial.HgServeDialog.html#HgServeDialog.closeEvent" /> - <keyword name="HgShelveBrowserDialog" id="HgShelveBrowserDialog" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.html#HgShelveBrowserDialog" /> - <keyword name="HgShelveBrowserDialog (Constructor)" id="HgShelveBrowserDialog (Constructor)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.html#HgShelveBrowserDialog.__init__" /> - <keyword name="HgShelveBrowserDialog (Module)" id="HgShelveBrowserDialog (Module)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.html" /> - <keyword name="HgShelveBrowserDialog.__cleanupShelves" id="HgShelveBrowserDialog.__cleanupShelves" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.html#HgShelveBrowserDialog.__cleanupShelves" /> - <keyword name="HgShelveBrowserDialog.__deleteShelves" id="HgShelveBrowserDialog.__deleteShelves" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.html#HgShelveBrowserDialog.__deleteShelves" /> - <keyword name="HgShelveBrowserDialog.__finish" id="HgShelveBrowserDialog.__finish" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.html#HgShelveBrowserDialog.__finish" /> - <keyword name="HgShelveBrowserDialog.__generateShelveEntry" id="HgShelveBrowserDialog.__generateShelveEntry" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.html#HgShelveBrowserDialog.__generateShelveEntry" /> - <keyword name="HgShelveBrowserDialog.__getShelveEntries" id="HgShelveBrowserDialog.__getShelveEntries" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.html#HgShelveBrowserDialog.__getShelveEntries" /> - <keyword name="HgShelveBrowserDialog.__processBuffer" id="HgShelveBrowserDialog.__processBuffer" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.html#HgShelveBrowserDialog.__processBuffer" /> - <keyword name="HgShelveBrowserDialog.__resetUI" id="HgShelveBrowserDialog.__resetUI" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.html#HgShelveBrowserDialog.__resetUI" /> - <keyword name="HgShelveBrowserDialog.__resizeColumnsShelves" id="HgShelveBrowserDialog.__resizeColumnsShelves" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.html#HgShelveBrowserDialog.__resizeColumnsShelves" /> - <keyword name="HgShelveBrowserDialog.__showError" id="HgShelveBrowserDialog.__showError" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.html#HgShelveBrowserDialog.__showError" /> - <keyword name="HgShelveBrowserDialog.__unshelve" id="HgShelveBrowserDialog.__unshelve" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.html#HgShelveBrowserDialog.__unshelve" /> - <keyword name="HgShelveBrowserDialog.closeEvent" id="HgShelveBrowserDialog.closeEvent" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.html#HgShelveBrowserDialog.closeEvent" /> - <keyword name="HgShelveBrowserDialog.on_buttonBox_clicked" id="HgShelveBrowserDialog.on_buttonBox_clicked" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.html#HgShelveBrowserDialog.on_buttonBox_clicked" /> - <keyword name="HgShelveBrowserDialog.on_refreshButton_clicked" id="HgShelveBrowserDialog.on_refreshButton_clicked" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.html#HgShelveBrowserDialog.on_refreshButton_clicked" /> - <keyword name="HgShelveBrowserDialog.on_shelveList_currentItemChanged" id="HgShelveBrowserDialog.on_shelveList_currentItemChanged" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.html#HgShelveBrowserDialog.on_shelveList_currentItemChanged" /> - <keyword name="HgShelveBrowserDialog.on_shelveList_customContextMenuRequested" id="HgShelveBrowserDialog.on_shelveList_customContextMenuRequested" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.html#HgShelveBrowserDialog.on_shelveList_customContextMenuRequested" /> - <keyword name="HgShelveBrowserDialog.show" id="HgShelveBrowserDialog.show" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.html#HgShelveBrowserDialog.show" /> - <keyword name="HgShelveBrowserDialog.start" id="HgShelveBrowserDialog.start" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.html#HgShelveBrowserDialog.start" /> - <keyword name="HgShelveDataDialog" id="HgShelveDataDialog" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveDataDialog.html#HgShelveDataDialog" /> - <keyword name="HgShelveDataDialog (Constructor)" id="HgShelveDataDialog (Constructor)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveDataDialog.html#HgShelveDataDialog.__init__" /> - <keyword name="HgShelveDataDialog (Module)" id="HgShelveDataDialog (Module)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveDataDialog.html" /> - <keyword name="HgShelveDataDialog.getData" id="HgShelveDataDialog.getData" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveDataDialog.html#HgShelveDataDialog.getData" /> - <keyword name="HgShelvesSelectionDialog" id="HgShelvesSelectionDialog" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelvesSelectionDialog.html#HgShelvesSelectionDialog" /> - <keyword name="HgShelvesSelectionDialog (Constructor)" id="HgShelvesSelectionDialog (Constructor)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelvesSelectionDialog.html#HgShelvesSelectionDialog.__init__" /> - <keyword name="HgShelvesSelectionDialog (Module)" id="HgShelvesSelectionDialog (Module)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelvesSelectionDialog.html" /> - <keyword name="HgShelvesSelectionDialog.getSelectedShelves" id="HgShelvesSelectionDialog.getSelectedShelves" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelvesSelectionDialog.html#HgShelvesSelectionDialog.getSelectedShelves" /> - <keyword name="HgShelvesSelectionDialog.on_shelvesList_itemSelectionChanged" id="HgShelvesSelectionDialog.on_shelvesList_itemSelectionChanged" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelvesSelectionDialog.html#HgShelvesSelectionDialog.on_shelvesList_itemSelectionChanged" /> + <keyword name="HgShelveBrowserDialog" id="HgShelveBrowserDialog" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveBrowserDialog.html#HgShelveBrowserDialog" /> + <keyword name="HgShelveBrowserDialog (Constructor)" id="HgShelveBrowserDialog (Constructor)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveBrowserDialog.html#HgShelveBrowserDialog.__init__" /> + <keyword name="HgShelveBrowserDialog (Module)" id="HgShelveBrowserDialog (Module)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveBrowserDialog.html" /> + <keyword name="HgShelveBrowserDialog.__cleanupShelves" id="HgShelveBrowserDialog.__cleanupShelves" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveBrowserDialog.html#HgShelveBrowserDialog.__cleanupShelves" /> + <keyword name="HgShelveBrowserDialog.__deleteShelves" id="HgShelveBrowserDialog.__deleteShelves" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveBrowserDialog.html#HgShelveBrowserDialog.__deleteShelves" /> + <keyword name="HgShelveBrowserDialog.__finish" id="HgShelveBrowserDialog.__finish" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveBrowserDialog.html#HgShelveBrowserDialog.__finish" /> + <keyword name="HgShelveBrowserDialog.__generateShelveEntry" id="HgShelveBrowserDialog.__generateShelveEntry" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveBrowserDialog.html#HgShelveBrowserDialog.__generateShelveEntry" /> + <keyword name="HgShelveBrowserDialog.__getShelveEntries" id="HgShelveBrowserDialog.__getShelveEntries" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveBrowserDialog.html#HgShelveBrowserDialog.__getShelveEntries" /> + <keyword name="HgShelveBrowserDialog.__processBuffer" id="HgShelveBrowserDialog.__processBuffer" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveBrowserDialog.html#HgShelveBrowserDialog.__processBuffer" /> + <keyword name="HgShelveBrowserDialog.__resetUI" id="HgShelveBrowserDialog.__resetUI" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveBrowserDialog.html#HgShelveBrowserDialog.__resetUI" /> + <keyword name="HgShelveBrowserDialog.__resizeColumnsShelves" id="HgShelveBrowserDialog.__resizeColumnsShelves" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveBrowserDialog.html#HgShelveBrowserDialog.__resizeColumnsShelves" /> + <keyword name="HgShelveBrowserDialog.__showError" id="HgShelveBrowserDialog.__showError" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveBrowserDialog.html#HgShelveBrowserDialog.__showError" /> + <keyword name="HgShelveBrowserDialog.__unshelve" id="HgShelveBrowserDialog.__unshelve" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveBrowserDialog.html#HgShelveBrowserDialog.__unshelve" /> + <keyword name="HgShelveBrowserDialog.closeEvent" id="HgShelveBrowserDialog.closeEvent" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveBrowserDialog.html#HgShelveBrowserDialog.closeEvent" /> + <keyword name="HgShelveBrowserDialog.on_buttonBox_clicked" id="HgShelveBrowserDialog.on_buttonBox_clicked" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveBrowserDialog.html#HgShelveBrowserDialog.on_buttonBox_clicked" /> + <keyword name="HgShelveBrowserDialog.on_refreshButton_clicked" id="HgShelveBrowserDialog.on_refreshButton_clicked" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveBrowserDialog.html#HgShelveBrowserDialog.on_refreshButton_clicked" /> + <keyword name="HgShelveBrowserDialog.on_shelveList_currentItemChanged" id="HgShelveBrowserDialog.on_shelveList_currentItemChanged" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveBrowserDialog.html#HgShelveBrowserDialog.on_shelveList_currentItemChanged" /> + <keyword name="HgShelveBrowserDialog.on_shelveList_customContextMenuRequested" id="HgShelveBrowserDialog.on_shelveList_customContextMenuRequested" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveBrowserDialog.html#HgShelveBrowserDialog.on_shelveList_customContextMenuRequested" /> + <keyword name="HgShelveBrowserDialog.show" id="HgShelveBrowserDialog.show" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveBrowserDialog.html#HgShelveBrowserDialog.show" /> + <keyword name="HgShelveBrowserDialog.start" id="HgShelveBrowserDialog.start" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveBrowserDialog.html#HgShelveBrowserDialog.start" /> + <keyword name="HgShelveDataDialog" id="HgShelveDataDialog" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveDataDialog.html#HgShelveDataDialog" /> + <keyword name="HgShelveDataDialog (Constructor)" id="HgShelveDataDialog (Constructor)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveDataDialog.html#HgShelveDataDialog.__init__" /> + <keyword name="HgShelveDataDialog (Module)" id="HgShelveDataDialog (Module)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveDataDialog.html" /> + <keyword name="HgShelveDataDialog.getData" id="HgShelveDataDialog.getData" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveDataDialog.html#HgShelveDataDialog.getData" /> + <keyword name="HgShelvesSelectionDialog" id="HgShelvesSelectionDialog" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelvesSelectionDialog.html#HgShelvesSelectionDialog" /> + <keyword name="HgShelvesSelectionDialog (Constructor)" id="HgShelvesSelectionDialog (Constructor)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelvesSelectionDialog.html#HgShelvesSelectionDialog.__init__" /> + <keyword name="HgShelvesSelectionDialog (Module)" id="HgShelvesSelectionDialog (Module)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelvesSelectionDialog.html" /> + <keyword name="HgShelvesSelectionDialog.getSelectedShelves" id="HgShelvesSelectionDialog.getSelectedShelves" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelvesSelectionDialog.html#HgShelvesSelectionDialog.getSelectedShelves" /> + <keyword name="HgShelvesSelectionDialog.on_shelvesList_itemSelectionChanged" id="HgShelvesSelectionDialog.on_shelvesList_itemSelectionChanged" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelvesSelectionDialog.html#HgShelvesSelectionDialog.on_shelvesList_itemSelectionChanged" /> <keyword name="HgStatusDialog" id="HgStatusDialog" ref="eric7.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog" /> <keyword name="HgStatusDialog (Constructor)" id="HgStatusDialog (Constructor)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__init__" /> <keyword name="HgStatusDialog (Module)" id="HgStatusDialog (Module)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html" /> @@ -9793,12 +9823,6 @@ <keyword name="HgStatusMonitorThread._getInfo" id="HgStatusMonitorThread._getInfo" ref="eric7.Plugins.VcsPlugins.vcsMercurial.HgStatusMonitorThread.html#HgStatusMonitorThread._getInfo" /> <keyword name="HgStatusMonitorThread._performMonitor" id="HgStatusMonitorThread._performMonitor" ref="eric7.Plugins.VcsPlugins.vcsMercurial.HgStatusMonitorThread.html#HgStatusMonitorThread._performMonitor" /> <keyword name="HgStatusMonitorThread._shutdown" id="HgStatusMonitorThread._shutdown" ref="eric7.Plugins.VcsPlugins.vcsMercurial.HgStatusMonitorThread.html#HgStatusMonitorThread._shutdown" /> - <keyword name="HgStripDialog" id="HgStripDialog" ref="eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.HgStripDialog.html#HgStripDialog" /> - <keyword name="HgStripDialog (Constructor)" id="HgStripDialog (Constructor)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.HgStripDialog.html#HgStripDialog.__init__" /> - <keyword name="HgStripDialog (Module)" id="HgStripDialog (Module)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.HgStripDialog.html" /> - <keyword name="HgStripDialog.__getRevision" id="HgStripDialog.__getRevision" ref="eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.HgStripDialog.html#HgStripDialog.__getRevision" /> - <keyword name="HgStripDialog.__updateOK" id="HgStripDialog.__updateOK" ref="eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.HgStripDialog.html#HgStripDialog.__updateOK" /> - <keyword name="HgStripDialog.getData" id="HgStripDialog.getData" ref="eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.HgStripDialog.html#HgStripDialog.getData" /> <keyword name="HgSummaryDialog" id="HgSummaryDialog" ref="eric7.Plugins.VcsPlugins.vcsMercurial.HgSummaryDialog.html#HgSummaryDialog" /> <keyword name="HgSummaryDialog (Constructor)" id="HgSummaryDialog (Constructor)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.HgSummaryDialog.html#HgSummaryDialog.__init__" /> <keyword name="HgSummaryDialog (Module)" id="HgSummaryDialog (Module)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.HgSummaryDialog.html" /> @@ -9833,10 +9857,15 @@ <keyword name="HgTagDialog.on_tagCombo_currentIndexChanged" id="HgTagDialog.on_tagCombo_currentIndexChanged" ref="eric7.Plugins.VcsPlugins.vcsMercurial.HgTagDialog.html#HgTagDialog.on_tagCombo_currentIndexChanged" /> <keyword name="HgTagDialog.on_tagCombo_editTextChanged" id="HgTagDialog.on_tagCombo_editTextChanged" ref="eric7.Plugins.VcsPlugins.vcsMercurial.HgTagDialog.html#HgTagDialog.on_tagCombo_editTextChanged" /> <keyword name="HgTagOperation" id="HgTagOperation" ref="eric7.Plugins.VcsPlugins.vcsMercurial.HgTagDialog.html#HgTagOperation" /> - <keyword name="HgUnshelveDataDialog" id="HgUnshelveDataDialog" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgUnshelveDataDialog.html#HgUnshelveDataDialog" /> - <keyword name="HgUnshelveDataDialog (Constructor)" id="HgUnshelveDataDialog (Constructor)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgUnshelveDataDialog.html#HgUnshelveDataDialog.__init__" /> - <keyword name="HgUnshelveDataDialog (Module)" id="HgUnshelveDataDialog (Module)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgUnshelveDataDialog.html" /> - <keyword name="HgUnshelveDataDialog.getData" id="HgUnshelveDataDialog.getData" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgUnshelveDataDialog.html#HgUnshelveDataDialog.getData" /> + <keyword name="HgUncommitDialog" id="HgUncommitDialog" ref="eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.HgUncommitDialog.html#HgUncommitDialog" /> + <keyword name="HgUncommitDialog (Constructor)" id="HgUncommitDialog (Constructor)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.HgUncommitDialog.html#HgUncommitDialog.__init__" /> + <keyword name="HgUncommitDialog (Module)" id="HgUncommitDialog (Module)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.HgUncommitDialog.html" /> + <keyword name="HgUncommitDialog.getUncommitData" id="HgUncommitDialog.getUncommitData" ref="eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.HgUncommitDialog.html#HgUncommitDialog.getUncommitData" /> + <keyword name="HgUncommitDialog.on_recentComboBox_activated" id="HgUncommitDialog.on_recentComboBox_activated" ref="eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.HgUncommitDialog.html#HgUncommitDialog.on_recentComboBox_activated" /> + <keyword name="HgUnshelveDataDialog" id="HgUnshelveDataDialog" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgUnshelveDataDialog.html#HgUnshelveDataDialog" /> + <keyword name="HgUnshelveDataDialog (Constructor)" id="HgUnshelveDataDialog (Constructor)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgUnshelveDataDialog.html#HgUnshelveDataDialog.__init__" /> + <keyword name="HgUnshelveDataDialog (Module)" id="HgUnshelveDataDialog (Module)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgUnshelveDataDialog.html" /> + <keyword name="HgUnshelveDataDialog.getData" id="HgUnshelveDataDialog.getData" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgUnshelveDataDialog.html#HgUnshelveDataDialog.getData" /> <keyword name="HgUserConfigDialog" id="HgUserConfigDialog" ref="eric7.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html#HgUserConfigDialog" /> <keyword name="HgUserConfigDialog (Constructor)" id="HgUserConfigDialog (Constructor)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html#HgUserConfigDialog.__init__" /> <keyword name="HgUserConfigDialog (Module)" id="HgUserConfigDialog (Module)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html" /> @@ -10863,7 +10892,7 @@ <keyword name="LargefilesProjectBrowserHelper.__hgAddLargefiles" id="LargefilesProjectBrowserHelper.__hgAddLargefiles" ref="eric7.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.ProjectBrowserHelper.html#LargefilesProjectBrowserHelper.__hgAddLargefiles" /> <keyword name="LargefilesProjectBrowserHelper.initMenus" id="LargefilesProjectBrowserHelper.initMenus" ref="eric7.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.ProjectBrowserHelper.html#LargefilesProjectBrowserHelper.initMenus" /> <keyword name="LargefilesProjectBrowserHelper.menuTitle" id="LargefilesProjectBrowserHelper.menuTitle" ref="eric7.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.ProjectBrowserHelper.html#LargefilesProjectBrowserHelper.menuTitle" /> - <keyword name="LargefilesProjectBrowserHelper.showExtensionMenu" id="LargefilesProjectBrowserHelper.showExtensionMenu" ref="eric7.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.ProjectBrowserHelper.html#LargefilesProjectBrowserHelper.showExtensionMenu" /> + <keyword name="LargefilesProjectBrowserHelper.showMenu" id="LargefilesProjectBrowserHelper.showMenu" ref="eric7.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.ProjectBrowserHelper.html#LargefilesProjectBrowserHelper.showMenu" /> <keyword name="LargefilesProjectHelper" id="LargefilesProjectHelper" ref="eric7.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.ProjectHelper.html#LargefilesProjectHelper" /> <keyword name="LargefilesProjectHelper (Constructor)" id="LargefilesProjectHelper (Constructor)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.ProjectHelper.html#LargefilesProjectHelper.__init__" /> <keyword name="LargefilesProjectHelper.__hgLfPull" id="LargefilesProjectHelper.__hgLfPull" ref="eric7.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.ProjectHelper.html#LargefilesProjectHelper.__hgLfPull" /> @@ -12954,6 +12983,7 @@ <keyword name="Pip.installPyprojectDependencies" id="Pip.installPyprojectDependencies" ref="eric7.PipInterface.Pip.html#Pip.installPyprojectDependencies" /> <keyword name="Pip.installRequirements" id="Pip.installRequirements" ref="eric7.PipInterface.Pip.html#Pip.installRequirements" /> <keyword name="Pip.repairPip" id="Pip.repairPip" ref="eric7.PipInterface.Pip.html#Pip.repairPip" /> + <keyword name="Pip.runCleanup" id="Pip.runCleanup" ref="eric7.PipInterface.Pip.html#Pip.runCleanup" /> <keyword name="Pip.runProcess" id="Pip.runProcess" ref="eric7.PipInterface.Pip.html#Pip.runProcess" /> <keyword name="Pip.showCacheInfo" id="Pip.showCacheInfo" ref="eric7.PipInterface.Pip.html#Pip.showCacheInfo" /> <keyword name="Pip.shutdown" id="Pip.shutdown" ref="eric7.PipInterface.Pip.html#Pip.shutdown" /> @@ -13038,7 +13068,6 @@ <keyword name="PipPackagesWidget.__editConfiguration" id="PipPackagesWidget.__editConfiguration" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.__editConfiguration" /> <keyword name="PipPackagesWidget.__editUserConfiguration" id="PipPackagesWidget.__editUserConfiguration" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.__editUserConfiguration" /> <keyword name="PipPackagesWidget.__editVirtualenvConfiguration" id="PipPackagesWidget.__editVirtualenvConfiguration" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.__editVirtualenvConfiguration" /> - <keyword name="PipPackagesWidget.__finishSearch" id="PipPackagesWidget.__finishSearch" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.__finishSearch" /> <keyword name="PipPackagesWidget.__generateConstraints" id="PipPackagesWidget.__generateConstraints" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.__generateConstraints" /> <keyword name="PipPackagesWidget.__generateRequirements" id="PipPackagesWidget.__generateRequirements" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.__generateRequirements" /> <keyword name="PipPackagesWidget.__initPipMenu" id="PipPackagesWidget.__initPipMenu" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.__initPipMenu" /> @@ -13059,39 +13088,31 @@ <keyword name="PipPackagesWidget.__reinstallPackages" id="PipPackagesWidget.__reinstallPackages" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.__reinstallPackages" /> <keyword name="PipPackagesWidget.__removeCachedFiles" id="PipPackagesWidget.__removeCachedFiles" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.__removeCachedFiles" /> <keyword name="PipPackagesWidget.__repairPip" id="PipPackagesWidget.__repairPip" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.__repairPip" /> - <keyword name="PipPackagesWidget.__search" id="PipPackagesWidget.__search" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.__search" /> - <keyword name="PipPackagesWidget.__searchFirst" id="PipPackagesWidget.__searchFirst" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.__searchFirst" /> - <keyword name="PipPackagesWidget.__searchResponse" id="PipPackagesWidget.__searchResponse" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.__searchResponse" /> <keyword name="PipPackagesWidget.__selectedUpdateableItems" id="PipPackagesWidget.__selectedUpdateableItems" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.__selectedUpdateableItems" /> <keyword name="PipPackagesWidget.__showCacheInfo" id="PipPackagesWidget.__showCacheInfo" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.__showCacheInfo" /> <keyword name="PipPackagesWidget.__showCacheList" id="PipPackagesWidget.__showCacheList" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.__showCacheList" /> <keyword name="PipPackagesWidget.__showLicensesDialog" id="PipPackagesWidget.__showLicensesDialog" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.__showLicensesDialog" /> <keyword name="PipPackagesWidget.__showPackageDetails" id="PipPackagesWidget.__showPackageDetails" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.__showPackageDetails" /> <keyword name="PipPackagesWidget.__showPackageInformation" id="PipPackagesWidget.__showPackageInformation" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.__showPackageInformation" /> - <keyword name="PipPackagesWidget.__showSearchedDetails" id="PipPackagesWidget.__showSearchedDetails" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.__showSearchedDetails" /> <keyword name="PipPackagesWidget.__showVulnerabilityInformation" id="PipPackagesWidget.__showVulnerabilityInformation" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.__showVulnerabilityInformation" /> <keyword name="PipPackagesWidget.__uninstallPyprojectDependencies" id="PipPackagesWidget.__uninstallPyprojectDependencies" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.__uninstallPyprojectDependencies" /> <keyword name="PipPackagesWidget.__uninstallRequirements" id="PipPackagesWidget.__uninstallRequirements" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.__uninstallRequirements" /> <keyword name="PipPackagesWidget.__updateActionButtons" id="PipPackagesWidget.__updateActionButtons" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.__updateActionButtons" /> <keyword name="PipPackagesWidget.__updateDepActionButtons" id="PipPackagesWidget.__updateDepActionButtons" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.__updateDepActionButtons" /> <keyword name="PipPackagesWidget.__updateOutdatedInfo" id="PipPackagesWidget.__updateOutdatedInfo" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.__updateOutdatedInfo" /> - <keyword name="PipPackagesWidget.__updateSearchActionButtons" id="PipPackagesWidget.__updateSearchActionButtons" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.__updateSearchActionButtons" /> - <keyword name="PipPackagesWidget.__updateSearchButton" id="PipPackagesWidget.__updateSearchButton" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.__updateSearchButton" /> - <keyword name="PipPackagesWidget.__updateSearchMoreButton" id="PipPackagesWidget.__updateSearchMoreButton" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.__updateSearchMoreButton" /> <keyword name="PipPackagesWidget.__updateVulnerabilityData" id="PipPackagesWidget.__updateVulnerabilityData" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.__updateVulnerabilityData" /> <keyword name="PipPackagesWidget.__updateVulnerabilityDbCache" id="PipPackagesWidget.__updateVulnerabilityDbCache" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.__updateVulnerabilityDbCache" /> <keyword name="PipPackagesWidget.executeInstallPackages" id="PipPackagesWidget.executeInstallPackages" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.executeInstallPackages" /> <keyword name="PipPackagesWidget.executeUninstallPackages" id="PipPackagesWidget.executeUninstallPackages" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.executeUninstallPackages" /> <keyword name="PipPackagesWidget.executeUpgradePackages" id="PipPackagesWidget.executeUpgradePackages" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.executeUpgradePackages" /> <keyword name="PipPackagesWidget.getPip" id="PipPackagesWidget.getPip" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.getPip" /> + <keyword name="PipPackagesWidget.on_cleanupButton_clicked" id="PipPackagesWidget.on_cleanupButton_clicked" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.on_cleanupButton_clicked" /> <keyword name="PipPackagesWidget.on_dependenciesList_itemActivated" id="PipPackagesWidget.on_dependenciesList_itemActivated" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.on_dependenciesList_itemActivated" /> <keyword name="PipPackagesWidget.on_dependenciesList_itemPressed" id="PipPackagesWidget.on_dependenciesList_itemPressed" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.on_dependenciesList_itemPressed" /> <keyword name="PipPackagesWidget.on_dependenciesList_itemSelectionChanged" id="PipPackagesWidget.on_dependenciesList_itemSelectionChanged" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.on_dependenciesList_itemSelectionChanged" /> <keyword name="PipPackagesWidget.on_dependencyRepairAllButton_clicked" id="PipPackagesWidget.on_dependencyRepairAllButton_clicked" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.on_dependencyRepairAllButton_clicked" /> <keyword name="PipPackagesWidget.on_dependencyRepairButton_clicked" id="PipPackagesWidget.on_dependencyRepairButton_clicked" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.on_dependencyRepairButton_clicked" /> <keyword name="PipPackagesWidget.on_environmentsComboBox_currentTextChanged" id="PipPackagesWidget.on_environmentsComboBox_currentTextChanged" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.on_environmentsComboBox_currentTextChanged" /> - <keyword name="PipPackagesWidget.on_installButton_clicked" id="PipPackagesWidget.on_installButton_clicked" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.on_installButton_clicked" /> - <keyword name="PipPackagesWidget.on_installUserSiteButton_clicked" id="PipPackagesWidget.on_installUserSiteButton_clicked" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.on_installUserSiteButton_clicked" /> <keyword name="PipPackagesWidget.on_installedFilesCheckBox_clicked" id="PipPackagesWidget.on_installedFilesCheckBox_clicked" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.on_installedFilesCheckBox_clicked" /> <keyword name="PipPackagesWidget.on_localCheckBox_clicked" id="PipPackagesWidget.on_localCheckBox_clicked" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.on_localCheckBox_clicked" /> <keyword name="PipPackagesWidget.on_localDepCheckBox_clicked" id="PipPackagesWidget.on_localDepCheckBox_clicked" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.on_localDepCheckBox_clicked" /> @@ -13102,15 +13123,8 @@ <keyword name="PipPackagesWidget.on_refreshDependenciesButton_clicked" id="PipPackagesWidget.on_refreshDependenciesButton_clicked" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.on_refreshDependenciesButton_clicked" /> <keyword name="PipPackagesWidget.on_requiresButton_toggled" id="PipPackagesWidget.on_requiresButton_toggled" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.on_requiresButton_toggled" /> <keyword name="PipPackagesWidget.on_searchButton_clicked" id="PipPackagesWidget.on_searchButton_clicked" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.on_searchButton_clicked" /> - <keyword name="PipPackagesWidget.on_searchMoreButton_clicked" id="PipPackagesWidget.on_searchMoreButton_clicked" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.on_searchMoreButton_clicked" /> - <keyword name="PipPackagesWidget.on_searchNameEdit_returnPressed" id="PipPackagesWidget.on_searchNameEdit_returnPressed" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.on_searchNameEdit_returnPressed" /> - <keyword name="PipPackagesWidget.on_searchNameEdit_textChanged" id="PipPackagesWidget.on_searchNameEdit_textChanged" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.on_searchNameEdit_textChanged" /> - <keyword name="PipPackagesWidget.on_searchResultList_itemActivated" id="PipPackagesWidget.on_searchResultList_itemActivated" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.on_searchResultList_itemActivated" /> - <keyword name="PipPackagesWidget.on_searchResultList_itemSelectionChanged" id="PipPackagesWidget.on_searchResultList_itemSelectionChanged" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.on_searchResultList_itemSelectionChanged" /> - <keyword name="PipPackagesWidget.on_searchToggleButton_1_toggled" id="PipPackagesWidget.on_searchToggleButton_1_toggled" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.on_searchToggleButton_1_toggled" /> - <keyword name="PipPackagesWidget.on_searchToggleButton_2_toggled" id="PipPackagesWidget.on_searchToggleButton_2_toggled" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.on_searchToggleButton_2_toggled" /> + <keyword name="PipPackagesWidget.on_searchEdit_returnPressed" id="PipPackagesWidget.on_searchEdit_returnPressed" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.on_searchEdit_returnPressed" /> <keyword name="PipPackagesWidget.on_showDepPackageDetailsButton_clicked" id="PipPackagesWidget.on_showDepPackageDetailsButton_clicked" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.on_showDepPackageDetailsButton_clicked" /> - <keyword name="PipPackagesWidget.on_showDetailsButton_clicked" id="PipPackagesWidget.on_showDetailsButton_clicked" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.on_showDetailsButton_clicked" /> <keyword name="PipPackagesWidget.on_showPackageDetailsButton_clicked" id="PipPackagesWidget.on_showPackageDetailsButton_clicked" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.on_showPackageDetailsButton_clicked" /> <keyword name="PipPackagesWidget.on_uninstallButton_clicked" id="PipPackagesWidget.on_uninstallButton_clicked" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.on_uninstallButton_clicked" /> <keyword name="PipPackagesWidget.on_upgradeAllButton_clicked" id="PipPackagesWidget.on_upgradeAllButton_clicked" ref="eric7.PipInterface.PipPackagesWidget.html#PipPackagesWidget.on_upgradeAllButton_clicked" /> @@ -13285,6 +13299,7 @@ <keyword name="PluginRepositoryReader.readXML" id="PluginRepositoryReader.readXML" ref="eric7.PluginManager.PluginRepositoryReader.html#PluginRepositoryReader.readXML" /> <keyword name="PluginRepositoryWidget" id="PluginRepositoryWidget" ref="eric7.PluginManager.PluginRepositoryDialog.html#PluginRepositoryWidget" /> <keyword name="PluginRepositoryWidget (Constructor)" id="PluginRepositoryWidget (Constructor)" ref="eric7.PluginManager.PluginRepositoryDialog.html#PluginRepositoryWidget.__init__" /> + <keyword name="PluginRepositoryWidget.__addPluginItem" id="PluginRepositoryWidget.__addPluginItem" ref="eric7.PluginManager.PluginRepositoryDialog.html#PluginRepositoryWidget.__addPluginItem" /> <keyword name="PluginRepositoryWidget.__changeScheme" id="PluginRepositoryWidget.__changeScheme" ref="eric7.PluginManager.PluginRepositoryDialog.html#PluginRepositoryWidget.__changeScheme" /> <keyword name="PluginRepositoryWidget.__cleanupDownloads" id="PluginRepositoryWidget.__cleanupDownloads" ref="eric7.PluginManager.PluginRepositoryDialog.html#PluginRepositoryWidget.__cleanupDownloads" /> <keyword name="PluginRepositoryWidget.__closeAndInstall" id="PluginRepositoryWidget.__closeAndInstall" ref="eric7.PluginManager.PluginRepositoryDialog.html#PluginRepositoryWidget.__closeAndInstall" /> @@ -13305,13 +13320,13 @@ <keyword name="PluginRepositoryWidget.__initHeaderItemsCache" id="PluginRepositoryWidget.__initHeaderItemsCache" ref="eric7.PluginManager.PluginRepositoryDialog.html#PluginRepositoryWidget.__initHeaderItemsCache" /> <keyword name="PluginRepositoryWidget.__populateList" id="PluginRepositoryWidget.__populateList" ref="eric7.PluginManager.PluginRepositoryDialog.html#PluginRepositoryWidget.__populateList" /> <keyword name="PluginRepositoryWidget.__reachabilityChanged" id="PluginRepositoryWidget.__reachabilityChanged" ref="eric7.PluginManager.PluginRepositoryDialog.html#PluginRepositoryWidget.__reachabilityChanged" /> - <keyword name="PluginRepositoryWidget.__resortRepositoryList" id="PluginRepositoryWidget.__resortRepositoryList" ref="eric7.PluginManager.PluginRepositoryDialog.html#PluginRepositoryWidget.__resortRepositoryList" /> <keyword name="PluginRepositoryWidget.__selectedItems" id="PluginRepositoryWidget.__selectedItems" ref="eric7.PluginManager.PluginRepositoryDialog.html#PluginRepositoryWidget.__selectedItems" /> <keyword name="PluginRepositoryWidget.__showAllPlugins" id="PluginRepositoryWidget.__showAllPlugins" ref="eric7.PluginManager.PluginRepositoryDialog.html#PluginRepositoryWidget.__showAllPlugins" /> <keyword name="PluginRepositoryWidget.__sslErrors" id="PluginRepositoryWidget.__sslErrors" ref="eric7.PluginManager.PluginRepositoryDialog.html#PluginRepositoryWidget.__sslErrors" /> <keyword name="PluginRepositoryWidget.__updateHiddenPluginsList" id="PluginRepositoryWidget.__updateHiddenPluginsList" ref="eric7.PluginManager.PluginRepositoryDialog.html#PluginRepositoryWidget.__updateHiddenPluginsList" /> <keyword name="PluginRepositoryWidget.__updateList" id="PluginRepositoryWidget.__updateList" ref="eric7.PluginManager.PluginRepositoryDialog.html#PluginRepositoryWidget.__updateList" /> <keyword name="PluginRepositoryWidget.__updateStatus" id="PluginRepositoryWidget.__updateStatus" ref="eric7.PluginManager.PluginRepositoryDialog.html#PluginRepositoryWidget.__updateStatus" /> + <keyword name="PluginRepositoryWidget.__updateStatusItemTexts" id="PluginRepositoryWidget.__updateStatusItemTexts" ref="eric7.PluginManager.PluginRepositoryDialog.html#PluginRepositoryWidget.__updateStatusItemTexts" /> <keyword name="PluginRepositoryWidget.addEntry" id="PluginRepositoryWidget.addEntry" ref="eric7.PluginManager.PluginRepositoryDialog.html#PluginRepositoryWidget.addEntry" /> <keyword name="PluginRepositoryWidget.getDownloadedPlugins" id="PluginRepositoryWidget.getDownloadedPlugins" ref="eric7.PluginManager.PluginRepositoryDialog.html#PluginRepositoryWidget.getDownloadedPlugins" /> <keyword name="PluginRepositoryWidget.on_buttonBox_clicked" id="PluginRepositoryWidget.on_buttonBox_clicked" ref="eric7.PluginManager.PluginRepositoryDialog.html#PluginRepositoryWidget.on_buttonBox_clicked" /> @@ -13802,7 +13817,8 @@ <keyword name="ProjectBrowserHelper (Module)" id="ProjectBrowserHelper (Module)" ref="eric7.Plugins.VcsPlugins.vcsGit.ProjectBrowserHelper.html" /> <keyword name="ProjectBrowserHelper (Module)" id="ProjectBrowserHelper (Module)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.ProjectBrowserHelper.html" /> <keyword name="ProjectBrowserHelper (Module)" id="ProjectBrowserHelper (Module)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html" /> - <keyword name="ProjectBrowserHelper (Module)" id="ProjectBrowserHelper (Module)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectBrowserHelper.html" /> + <keyword name="ProjectBrowserHelper (Module)" id="ProjectBrowserHelper (Module)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.ProjectBrowserHelper.html" /> + <keyword name="ProjectBrowserHelper (Module)" id="ProjectBrowserHelper (Module)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.ProjectBrowserHelper.html" /> <keyword name="ProjectBrowserHelper (Module)" id="ProjectBrowserHelper (Module)" ref="eric7.Plugins.VcsPlugins.vcsPySvn.ProjectBrowserHelper.html" /> <keyword name="ProjectBrowserHelper (Module)" id="ProjectBrowserHelper (Module)" ref="eric7.Plugins.VcsPlugins.vcsSubversion.ProjectBrowserHelper.html" /> <keyword name="ProjectBrowserHelper (Module)" id="ProjectBrowserHelper (Module)" ref="eric7.VCS.ProjectBrowserHelper.html" /> @@ -13905,15 +13921,16 @@ <keyword name="ProjectFormsBrowser.handlePreferencesChanged" id="ProjectFormsBrowser.handlePreferencesChanged" ref="eric7.Project.ProjectFormsBrowser.html#ProjectFormsBrowser.handlePreferencesChanged" /> <keyword name="ProjectHelper (Module)" id="ProjectHelper (Module)" ref="eric7.Plugins.VcsPlugins.vcsGit.ProjectHelper.html" /> <keyword name="ProjectHelper (Module)" id="ProjectHelper (Module)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.ProjectHelper.html" /> + <keyword name="ProjectHelper (Module)" id="ProjectHelper (Module)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.ProjectHelper.html" /> <keyword name="ProjectHelper (Module)" id="ProjectHelper (Module)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.GpgExtension.ProjectHelper.html" /> <keyword name="ProjectHelper (Module)" id="ProjectHelper (Module)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.ProjectHelper.html" /> <keyword name="ProjectHelper (Module)" id="ProjectHelper (Module)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.ProjectHelper.html" /> <keyword name="ProjectHelper (Module)" id="ProjectHelper (Module)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html" /> - <keyword name="ProjectHelper (Module)" id="ProjectHelper (Module)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.ProjectHelper.html" /> + <keyword name="ProjectHelper (Module)" id="ProjectHelper (Module)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.ProjectHelper.html" /> <keyword name="ProjectHelper (Module)" id="ProjectHelper (Module)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.ProjectHelper.html" /> <keyword name="ProjectHelper (Module)" id="ProjectHelper (Module)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.ProjectHelper.html" /> - <keyword name="ProjectHelper (Module)" id="ProjectHelper (Module)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectHelper.html" /> - <keyword name="ProjectHelper (Module)" id="ProjectHelper (Module)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.ProjectHelper.html" /> + <keyword name="ProjectHelper (Module)" id="ProjectHelper (Module)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.ProjectHelper.html" /> + <keyword name="ProjectHelper (Module)" id="ProjectHelper (Module)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.ProjectHelper.html" /> <keyword name="ProjectHelper (Module)" id="ProjectHelper (Module)" ref="eric7.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html" /> <keyword name="ProjectHelper (Module)" id="ProjectHelper (Module)" ref="eric7.Plugins.VcsPlugins.vcsSubversion.ProjectHelper.html" /> <keyword name="ProjectHelper (Module)" id="ProjectHelper (Module)" ref="eric7.VCS.ProjectHelper.html" /> @@ -14111,22 +14128,24 @@ <keyword name="ProtocolHandlerManagerDialog.on_deleteButton_clicked" id="ProtocolHandlerManagerDialog.on_deleteButton_clicked" ref="eric7.WebBrowser.Network.ProtocolHandlerManagerDialog.html#ProtocolHandlerManagerDialog.on_deleteButton_clicked" /> <keyword name="ProtocolHandlerManagerDialog.on_protocolHandlersList_itemSelectionChanged" id="ProtocolHandlerManagerDialog.on_protocolHandlersList_itemSelectionChanged" ref="eric7.WebBrowser.Network.ProtocolHandlerManagerDialog.html#ProtocolHandlerManagerDialog.on_protocolHandlersList_itemSelectionChanged" /> <keyword name="Publics" id="Publics" ref="eric7.Utilities.ClassBrowsers.pyclbr.html#Publics" /> - <keyword name="Purge" id="Purge" ref="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.purge.html#Purge" /> - <keyword name="Purge (Constructor)" id="Purge (Constructor)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.purge.html#Purge.__init__" /> - <keyword name="Purge.__getEntries" id="Purge.__getEntries" ref="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.purge.html#Purge.__getEntries" /> - <keyword name="Purge.hgPurge" id="Purge.hgPurge" ref="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.purge.html#Purge.hgPurge" /> - <keyword name="Purge.hgPurgeList" id="Purge.hgPurgeList" ref="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.purge.html#Purge.hgPurgeList" /> - <keyword name="Purge.shutdown" id="Purge.shutdown" ref="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.purge.html#Purge.shutdown" /> - <keyword name="PurgeExtension (Package)" id="PurgeExtension (Package)" ref="index-eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.html" /> - <keyword name="PurgeProjectHelper" id="PurgeProjectHelper" ref="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.ProjectHelper.html#PurgeProjectHelper" /> - <keyword name="PurgeProjectHelper (Constructor)" id="PurgeProjectHelper (Constructor)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.ProjectHelper.html#PurgeProjectHelper.__init__" /> - <keyword name="PurgeProjectHelper.__hgPurge" id="PurgeProjectHelper.__hgPurge" ref="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.ProjectHelper.html#PurgeProjectHelper.__hgPurge" /> - <keyword name="PurgeProjectHelper.__hgPurgeAll" id="PurgeProjectHelper.__hgPurgeAll" ref="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.ProjectHelper.html#PurgeProjectHelper.__hgPurgeAll" /> - <keyword name="PurgeProjectHelper.__hgPurgeAllList" id="PurgeProjectHelper.__hgPurgeAllList" ref="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.ProjectHelper.html#PurgeProjectHelper.__hgPurgeAllList" /> - <keyword name="PurgeProjectHelper.__hgPurgeList" id="PurgeProjectHelper.__hgPurgeList" ref="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.ProjectHelper.html#PurgeProjectHelper.__hgPurgeList" /> - <keyword name="PurgeProjectHelper.initActions" id="PurgeProjectHelper.initActions" ref="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.ProjectHelper.html#PurgeProjectHelper.initActions" /> - <keyword name="PurgeProjectHelper.initMenu" id="PurgeProjectHelper.initMenu" ref="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.ProjectHelper.html#PurgeProjectHelper.initMenu" /> - <keyword name="PurgeProjectHelper.menuTitle" id="PurgeProjectHelper.menuTitle" ref="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.ProjectHelper.html#PurgeProjectHelper.menuTitle" /> + <keyword name="Purge" id="Purge" ref="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.purge.html#Purge" /> + <keyword name="Purge (Constructor)" id="Purge (Constructor)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.purge.html#Purge.__init__" /> + <keyword name="Purge.__getEntries" id="Purge.__getEntries" ref="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.purge.html#Purge.__getEntries" /> + <keyword name="Purge.hgPurge" id="Purge.hgPurge" ref="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.purge.html#Purge.hgPurge" /> + <keyword name="Purge.hgPurgeList" id="Purge.hgPurgeList" ref="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.purge.html#Purge.hgPurgeList" /> + <keyword name="Purge.shutdown" id="Purge.shutdown" ref="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.purge.html#Purge.shutdown" /> + <keyword name="PurgeBuiltin (Package)" id="PurgeBuiltin (Package)" ref="index-eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.html" /> + <keyword name="PurgeProjectHelper" id="PurgeProjectHelper" ref="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.ProjectHelper.html#PurgeProjectHelper" /> + <keyword name="PurgeProjectHelper (Constructor)" id="PurgeProjectHelper (Constructor)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.ProjectHelper.html#PurgeProjectHelper.__init__" /> + <keyword name="PurgeProjectHelper.__hgPurge" id="PurgeProjectHelper.__hgPurge" ref="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.ProjectHelper.html#PurgeProjectHelper.__hgPurge" /> + <keyword name="PurgeProjectHelper.__hgPurgeAll" id="PurgeProjectHelper.__hgPurgeAll" ref="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.ProjectHelper.html#PurgeProjectHelper.__hgPurgeAll" /> + <keyword name="PurgeProjectHelper.__hgPurgeAllList" id="PurgeProjectHelper.__hgPurgeAllList" ref="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.ProjectHelper.html#PurgeProjectHelper.__hgPurgeAllList" /> + <keyword name="PurgeProjectHelper.__hgPurgeIgnored" id="PurgeProjectHelper.__hgPurgeIgnored" ref="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.ProjectHelper.html#PurgeProjectHelper.__hgPurgeIgnored" /> + <keyword name="PurgeProjectHelper.__hgPurgeIgnoredList" id="PurgeProjectHelper.__hgPurgeIgnoredList" ref="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.ProjectHelper.html#PurgeProjectHelper.__hgPurgeIgnoredList" /> + <keyword name="PurgeProjectHelper.__hgPurgeList" id="PurgeProjectHelper.__hgPurgeList" ref="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.ProjectHelper.html#PurgeProjectHelper.__hgPurgeList" /> + <keyword name="PurgeProjectHelper.initActions" id="PurgeProjectHelper.initActions" ref="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.ProjectHelper.html#PurgeProjectHelper.initActions" /> + <keyword name="PurgeProjectHelper.initMenu" id="PurgeProjectHelper.initMenu" ref="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.ProjectHelper.html#PurgeProjectHelper.initMenu" /> + <keyword name="PurgeProjectHelper.menuTitle" id="PurgeProjectHelper.menuTitle" ref="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.ProjectHelper.html#PurgeProjectHelper.menuTitle" /> <keyword name="PyBoardDevice" id="PyBoardDevice" ref="eric7.MicroPython.Devices.PyBoardDevices.html#PyBoardDevice" /> <keyword name="PyBoardDevice (Constructor)" id="PyBoardDevice (Constructor)" ref="eric7.MicroPython.Devices.PyBoardDevices.html#PyBoardDevice.__init__" /> <keyword name="PyBoardDevice.__activateBootloader" id="PyBoardDevice.__activateBootloader" ref="eric7.MicroPython.Devices.PyBoardDevices.html#PyBoardDevice.__activateBootloader" /> @@ -14322,14 +14341,6 @@ <keyword name="PySvnProjectHelper.initMenu" id="PySvnProjectHelper.initMenu" ref="eric7.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#PySvnProjectHelper.initMenu" /> <keyword name="PySvnProjectHelper.initToolbar" id="PySvnProjectHelper.initToolbar" ref="eric7.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#PySvnProjectHelper.initToolbar" /> <keyword name="PySvnProjectHelper.removeToolbar" id="PySvnProjectHelper.removeToolbar" ref="eric7.Plugins.VcsPlugins.vcsPySvn.ProjectHelper.html#PySvnProjectHelper.removeToolbar" /> - <keyword name="PypiSearchResultsParser" id="PypiSearchResultsParser" ref="eric7.PipInterface.PipPackagesWidget.html#PypiSearchResultsParser" /> - <keyword name="PypiSearchResultsParser (Constructor)" id="PypiSearchResultsParser (Constructor)" ref="eric7.PipInterface.PipPackagesWidget.html#PypiSearchResultsParser.__init__" /> - <keyword name="PypiSearchResultsParser.__getClass" id="PypiSearchResultsParser.__getClass" ref="eric7.PipInterface.PipPackagesWidget.html#PypiSearchResultsParser.__getClass" /> - <keyword name="PypiSearchResultsParser.__getDate" id="PypiSearchResultsParser.__getDate" ref="eric7.PipInterface.PipPackagesWidget.html#PypiSearchResultsParser.__getDate" /> - <keyword name="PypiSearchResultsParser.getResults" id="PypiSearchResultsParser.getResults" ref="eric7.PipInterface.PipPackagesWidget.html#PypiSearchResultsParser.getResults" /> - <keyword name="PypiSearchResultsParser.handle_data" id="PypiSearchResultsParser.handle_data" ref="eric7.PipInterface.PipPackagesWidget.html#PypiSearchResultsParser.handle_data" /> - <keyword name="PypiSearchResultsParser.handle_endtag" id="PypiSearchResultsParser.handle_endtag" ref="eric7.PipInterface.PipPackagesWidget.html#PypiSearchResultsParser.handle_endtag" /> - <keyword name="PypiSearchResultsParser.handle_starttag" id="PypiSearchResultsParser.handle_starttag" ref="eric7.PipInterface.PipPackagesWidget.html#PypiSearchResultsParser.handle_starttag" /> <keyword name="PytestExecutor" id="PytestExecutor" ref="eric7.Testing.Interfaces.PytestExecutor.html#PytestExecutor" /> <keyword name="PytestExecutor (Constructor)" id="PytestExecutor (Constructor)" ref="eric7.Testing.Interfaces.PytestExecutor.html#PytestExecutor.__init__" /> <keyword name="PytestExecutor (Module)" id="PytestExecutor (Module)" ref="eric7.Testing.Interfaces.PytestExecutor.html" /> @@ -15564,38 +15575,38 @@ <keyword name="ShellWindow.getDebuggerId" id="ShellWindow.getDebuggerId" ref="eric7.QScintilla.ShellWindow.html#ShellWindow.getDebuggerId" /> <keyword name="ShellWindow.quit" id="ShellWindow.quit" ref="eric7.QScintilla.ShellWindow.html#ShellWindow.quit" /> <keyword name="ShellWindow.showFind" id="ShellWindow.showFind" ref="eric7.QScintilla.ShellWindow.html#ShellWindow.showFind" /> - <keyword name="Shelve" id="Shelve" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.shelve.html#Shelve" /> - <keyword name="Shelve (Constructor)" id="Shelve (Constructor)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.shelve.html#Shelve.__init__" /> - <keyword name="Shelve.__hgGetShelveNamesList" id="Shelve.__hgGetShelveNamesList" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.shelve.html#Shelve.__hgGetShelveNamesList" /> - <keyword name="Shelve.hgCleanupShelves" id="Shelve.hgCleanupShelves" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.shelve.html#Shelve.hgCleanupShelves" /> - <keyword name="Shelve.hgDeleteShelves" id="Shelve.hgDeleteShelves" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.shelve.html#Shelve.hgDeleteShelves" /> - <keyword name="Shelve.hgShelve" id="Shelve.hgShelve" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.shelve.html#Shelve.hgShelve" /> - <keyword name="Shelve.hgShelveBrowser" id="Shelve.hgShelveBrowser" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.shelve.html#Shelve.hgShelveBrowser" /> - <keyword name="Shelve.hgUnshelve" id="Shelve.hgUnshelve" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.shelve.html#Shelve.hgUnshelve" /> - <keyword name="Shelve.hgUnshelveAbort" id="Shelve.hgUnshelveAbort" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.shelve.html#Shelve.hgUnshelveAbort" /> - <keyword name="Shelve.hgUnshelveContinue" id="Shelve.hgUnshelveContinue" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.shelve.html#Shelve.hgUnshelveContinue" /> - <keyword name="Shelve.shutdown" id="Shelve.shutdown" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.shelve.html#Shelve.shutdown" /> - <keyword name="ShelveExtension (Package)" id="ShelveExtension (Package)" ref="index-eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.html" /> - <keyword name="ShelveProjectBrowserHelper" id="ShelveProjectBrowserHelper" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectBrowserHelper.html#ShelveProjectBrowserHelper" /> - <keyword name="ShelveProjectBrowserHelper (Constructor)" id="ShelveProjectBrowserHelper (Constructor)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectBrowserHelper.html#ShelveProjectBrowserHelper.__init__" /> - <keyword name="ShelveProjectBrowserHelper.__hgShelve" id="ShelveProjectBrowserHelper.__hgShelve" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectBrowserHelper.html#ShelveProjectBrowserHelper.__hgShelve" /> - <keyword name="ShelveProjectBrowserHelper.__reopenProject" id="ShelveProjectBrowserHelper.__reopenProject" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectBrowserHelper.html#ShelveProjectBrowserHelper.__reopenProject" /> - <keyword name="ShelveProjectBrowserHelper.initMenus" id="ShelveProjectBrowserHelper.initMenus" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectBrowserHelper.html#ShelveProjectBrowserHelper.initMenus" /> - <keyword name="ShelveProjectBrowserHelper.menuTitle" id="ShelveProjectBrowserHelper.menuTitle" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectBrowserHelper.html#ShelveProjectBrowserHelper.menuTitle" /> - <keyword name="ShelveProjectBrowserHelper.showExtensionMenu" id="ShelveProjectBrowserHelper.showExtensionMenu" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectBrowserHelper.html#ShelveProjectBrowserHelper.showExtensionMenu" /> - <keyword name="ShelveProjectHelper" id="ShelveProjectHelper" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectHelper.html#ShelveProjectHelper" /> - <keyword name="ShelveProjectHelper (Constructor)" id="ShelveProjectHelper (Constructor)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectHelper.html#ShelveProjectHelper.__init__" /> - <keyword name="ShelveProjectHelper.__hgCleanupShelves" id="ShelveProjectHelper.__hgCleanupShelves" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectHelper.html#ShelveProjectHelper.__hgCleanupShelves" /> - <keyword name="ShelveProjectHelper.__hgDeleteShelves" id="ShelveProjectHelper.__hgDeleteShelves" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectHelper.html#ShelveProjectHelper.__hgDeleteShelves" /> - <keyword name="ShelveProjectHelper.__hgShelve" id="ShelveProjectHelper.__hgShelve" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectHelper.html#ShelveProjectHelper.__hgShelve" /> - <keyword name="ShelveProjectHelper.__hgShelveBrowser" id="ShelveProjectHelper.__hgShelveBrowser" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectHelper.html#ShelveProjectHelper.__hgShelveBrowser" /> - <keyword name="ShelveProjectHelper.__hgUnshelve" id="ShelveProjectHelper.__hgUnshelve" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectHelper.html#ShelveProjectHelper.__hgUnshelve" /> - <keyword name="ShelveProjectHelper.__hgUnshelveAbort" id="ShelveProjectHelper.__hgUnshelveAbort" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectHelper.html#ShelveProjectHelper.__hgUnshelveAbort" /> - <keyword name="ShelveProjectHelper.__hgUnshelveContinue" id="ShelveProjectHelper.__hgUnshelveContinue" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectHelper.html#ShelveProjectHelper.__hgUnshelveContinue" /> - <keyword name="ShelveProjectHelper.__reopenProject" id="ShelveProjectHelper.__reopenProject" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectHelper.html#ShelveProjectHelper.__reopenProject" /> - <keyword name="ShelveProjectHelper.initActions" id="ShelveProjectHelper.initActions" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectHelper.html#ShelveProjectHelper.initActions" /> - <keyword name="ShelveProjectHelper.initMenu" id="ShelveProjectHelper.initMenu" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectHelper.html#ShelveProjectHelper.initMenu" /> - <keyword name="ShelveProjectHelper.menuTitle" id="ShelveProjectHelper.menuTitle" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectHelper.html#ShelveProjectHelper.menuTitle" /> + <keyword name="Shelve" id="Shelve" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.shelve.html#Shelve" /> + <keyword name="Shelve (Constructor)" id="Shelve (Constructor)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.shelve.html#Shelve.__init__" /> + <keyword name="Shelve.__hgGetShelveNamesList" id="Shelve.__hgGetShelveNamesList" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.shelve.html#Shelve.__hgGetShelveNamesList" /> + <keyword name="Shelve.hgCleanupShelves" id="Shelve.hgCleanupShelves" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.shelve.html#Shelve.hgCleanupShelves" /> + <keyword name="Shelve.hgDeleteShelves" id="Shelve.hgDeleteShelves" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.shelve.html#Shelve.hgDeleteShelves" /> + <keyword name="Shelve.hgShelve" id="Shelve.hgShelve" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.shelve.html#Shelve.hgShelve" /> + <keyword name="Shelve.hgShelveBrowser" id="Shelve.hgShelveBrowser" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.shelve.html#Shelve.hgShelveBrowser" /> + <keyword name="Shelve.hgUnshelve" id="Shelve.hgUnshelve" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.shelve.html#Shelve.hgUnshelve" /> + <keyword name="Shelve.hgUnshelveAbort" id="Shelve.hgUnshelveAbort" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.shelve.html#Shelve.hgUnshelveAbort" /> + <keyword name="Shelve.hgUnshelveContinue" id="Shelve.hgUnshelveContinue" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.shelve.html#Shelve.hgUnshelveContinue" /> + <keyword name="Shelve.shutdown" id="Shelve.shutdown" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.shelve.html#Shelve.shutdown" /> + <keyword name="ShelveBuiltin (Package)" id="ShelveBuiltin (Package)" ref="index-eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.html" /> + <keyword name="ShelveProjectBrowserHelper" id="ShelveProjectBrowserHelper" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.ProjectBrowserHelper.html#ShelveProjectBrowserHelper" /> + <keyword name="ShelveProjectBrowserHelper (Constructor)" id="ShelveProjectBrowserHelper (Constructor)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.ProjectBrowserHelper.html#ShelveProjectBrowserHelper.__init__" /> + <keyword name="ShelveProjectBrowserHelper.__hgShelve" id="ShelveProjectBrowserHelper.__hgShelve" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.ProjectBrowserHelper.html#ShelveProjectBrowserHelper.__hgShelve" /> + <keyword name="ShelveProjectBrowserHelper.__reopenProject" id="ShelveProjectBrowserHelper.__reopenProject" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.ProjectBrowserHelper.html#ShelveProjectBrowserHelper.__reopenProject" /> + <keyword name="ShelveProjectBrowserHelper.initMenus" id="ShelveProjectBrowserHelper.initMenus" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.ProjectBrowserHelper.html#ShelveProjectBrowserHelper.initMenus" /> + <keyword name="ShelveProjectBrowserHelper.menuTitle" id="ShelveProjectBrowserHelper.menuTitle" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.ProjectBrowserHelper.html#ShelveProjectBrowserHelper.menuTitle" /> + <keyword name="ShelveProjectBrowserHelper.showMenu" id="ShelveProjectBrowserHelper.showMenu" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.ProjectBrowserHelper.html#ShelveProjectBrowserHelper.showMenu" /> + <keyword name="ShelveProjectHelper" id="ShelveProjectHelper" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.ProjectHelper.html#ShelveProjectHelper" /> + <keyword name="ShelveProjectHelper (Constructor)" id="ShelveProjectHelper (Constructor)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.ProjectHelper.html#ShelveProjectHelper.__init__" /> + <keyword name="ShelveProjectHelper.__hgCleanupShelves" id="ShelveProjectHelper.__hgCleanupShelves" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.ProjectHelper.html#ShelveProjectHelper.__hgCleanupShelves" /> + <keyword name="ShelveProjectHelper.__hgDeleteShelves" id="ShelveProjectHelper.__hgDeleteShelves" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.ProjectHelper.html#ShelveProjectHelper.__hgDeleteShelves" /> + <keyword name="ShelveProjectHelper.__hgShelve" id="ShelveProjectHelper.__hgShelve" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.ProjectHelper.html#ShelveProjectHelper.__hgShelve" /> + <keyword name="ShelveProjectHelper.__hgShelveBrowser" id="ShelveProjectHelper.__hgShelveBrowser" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.ProjectHelper.html#ShelveProjectHelper.__hgShelveBrowser" /> + <keyword name="ShelveProjectHelper.__hgUnshelve" id="ShelveProjectHelper.__hgUnshelve" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.ProjectHelper.html#ShelveProjectHelper.__hgUnshelve" /> + <keyword name="ShelveProjectHelper.__hgUnshelveAbort" id="ShelveProjectHelper.__hgUnshelveAbort" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.ProjectHelper.html#ShelveProjectHelper.__hgUnshelveAbort" /> + <keyword name="ShelveProjectHelper.__hgUnshelveContinue" id="ShelveProjectHelper.__hgUnshelveContinue" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.ProjectHelper.html#ShelveProjectHelper.__hgUnshelveContinue" /> + <keyword name="ShelveProjectHelper.__reopenProject" id="ShelveProjectHelper.__reopenProject" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.ProjectHelper.html#ShelveProjectHelper.__reopenProject" /> + <keyword name="ShelveProjectHelper.initActions" id="ShelveProjectHelper.initActions" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.ProjectHelper.html#ShelveProjectHelper.initActions" /> + <keyword name="ShelveProjectHelper.initMenu" id="ShelveProjectHelper.initMenu" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.ProjectHelper.html#ShelveProjectHelper.initMenu" /> + <keyword name="ShelveProjectHelper.menuTitle" id="ShelveProjectHelper.menuTitle" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.ProjectHelper.html#ShelveProjectHelper.menuTitle" /> <keyword name="ShortcutDialog" id="ShortcutDialog" ref="eric7.Preferences.ShortcutDialog.html#ShortcutDialog" /> <keyword name="ShortcutDialog (Constructor)" id="ShortcutDialog (Constructor)" ref="eric7.Preferences.ShortcutDialog.html#ShortcutDialog.__init__" /> <keyword name="ShortcutDialog (Module)" id="ShortcutDialog (Module)" ref="eric7.Preferences.ShortcutDialog.html" /> @@ -16192,16 +16203,6 @@ <keyword name="StatusWidget.__toggleCheckMark" id="StatusWidget.__toggleCheckMark" ref="eric7.VCS.StatusWidget.html#StatusWidget.__toggleCheckMark" /> <keyword name="StatusWidget.__updateEnabledStates" id="StatusWidget.__updateEnabledStates" ref="eric7.VCS.StatusWidget.html#StatusWidget.__updateEnabledStates" /> <keyword name="StatusWidget.eventFilter" id="StatusWidget.eventFilter" ref="eric7.VCS.StatusWidget.html#StatusWidget.eventFilter" /> - <keyword name="Strip" id="Strip" ref="eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.strip.html#Strip" /> - <keyword name="Strip (Constructor)" id="Strip (Constructor)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.strip.html#Strip.__init__" /> - <keyword name="Strip.hgStrip" id="Strip.hgStrip" ref="eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.strip.html#Strip.hgStrip" /> - <keyword name="StripExtension (Package)" id="StripExtension (Package)" ref="index-eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.html" /> - <keyword name="StripProjectHelper" id="StripProjectHelper" ref="eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.ProjectHelper.html#StripProjectHelper" /> - <keyword name="StripProjectHelper (Constructor)" id="StripProjectHelper (Constructor)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.ProjectHelper.html#StripProjectHelper.__init__" /> - <keyword name="StripProjectHelper.__hgStrip" id="StripProjectHelper.__hgStrip" ref="eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.ProjectHelper.html#StripProjectHelper.__hgStrip" /> - <keyword name="StripProjectHelper.initActions" id="StripProjectHelper.initActions" ref="eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.ProjectHelper.html#StripProjectHelper.initActions" /> - <keyword name="StripProjectHelper.initMenu" id="StripProjectHelper.initMenu" ref="eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.ProjectHelper.html#StripProjectHelper.initMenu" /> - <keyword name="StripProjectHelper.menuTitle" id="StripProjectHelper.menuTitle" ref="eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.ProjectHelper.html#StripProjectHelper.menuTitle" /> <keyword name="StyleGuide" id="StyleGuide" ref="eric7.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#StyleGuide" /> <keyword name="StyleGuide (Constructor)" id="StyleGuide (Constructor)" ref="eric7.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#StyleGuide.__init__" /> <keyword name="StyleGuide.check_files" id="StyleGuide.check_files" ref="eric7.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#StyleGuide.check_files" /> @@ -18083,6 +18084,24 @@ <keyword name="UicCompilerOptionsDialog.getData" id="UicCompilerOptionsDialog.getData" ref="eric7.Project.UicCompilerOptionsDialog.html#UicCompilerOptionsDialog.getData" /> <keyword name="UicLoadUi5 (Module)" id="UicLoadUi5 (Module)" ref="eric7.Project.UicLoadUi5.html" /> <keyword name="UicLoadUi6 (Module)" id="UicLoadUi6 (Module)" ref="eric7.Project.UicLoadUi6.html" /> + <keyword name="Uncommit" id="Uncommit" ref="eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.uncommit.html#Uncommit" /> + <keyword name="Uncommit (Constructor)" id="Uncommit (Constructor)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.uncommit.html#Uncommit.__init__" /> + <keyword name="Uncommit.hgUncommit" id="Uncommit.hgUncommit" ref="eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.uncommit.html#Uncommit.hgUncommit" /> + <keyword name="UncommitExtension (Package)" id="UncommitExtension (Package)" ref="index-eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.html" /> + <keyword name="UncommitProjectBrowserHelper" id="UncommitProjectBrowserHelper" ref="eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.ProjectBrowserHelper.html#UncommitProjectBrowserHelper" /> + <keyword name="UncommitProjectBrowserHelper (Constructor)" id="UncommitProjectBrowserHelper (Constructor)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.ProjectBrowserHelper.html#UncommitProjectBrowserHelper.__init__" /> + <keyword name="UncommitProjectBrowserHelper.__hgUncommit" id="UncommitProjectBrowserHelper.__hgUncommit" ref="eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.ProjectBrowserHelper.html#UncommitProjectBrowserHelper.__hgUncommit" /> + <keyword name="UncommitProjectBrowserHelper.__reopenProject" id="UncommitProjectBrowserHelper.__reopenProject" ref="eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.ProjectBrowserHelper.html#UncommitProjectBrowserHelper.__reopenProject" /> + <keyword name="UncommitProjectBrowserHelper.initMenus" id="UncommitProjectBrowserHelper.initMenus" ref="eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.ProjectBrowserHelper.html#UncommitProjectBrowserHelper.initMenus" /> + <keyword name="UncommitProjectBrowserHelper.menuTitle" id="UncommitProjectBrowserHelper.menuTitle" ref="eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.ProjectBrowserHelper.html#UncommitProjectBrowserHelper.menuTitle" /> + <keyword name="UncommitProjectBrowserHelper.showMenu" id="UncommitProjectBrowserHelper.showMenu" ref="eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.ProjectBrowserHelper.html#UncommitProjectBrowserHelper.showMenu" /> + <keyword name="UncommitProjectHelper" id="UncommitProjectHelper" ref="eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.ProjectHelper.html#UncommitProjectHelper" /> + <keyword name="UncommitProjectHelper (Constructor)" id="UncommitProjectHelper (Constructor)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.ProjectHelper.html#UncommitProjectHelper.__init__" /> + <keyword name="UncommitProjectHelper.__hgUncommit" id="UncommitProjectHelper.__hgUncommit" ref="eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.ProjectHelper.html#UncommitProjectHelper.__hgUncommit" /> + <keyword name="UncommitProjectHelper.__reopenProject" id="UncommitProjectHelper.__reopenProject" ref="eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.ProjectHelper.html#UncommitProjectHelper.__reopenProject" /> + <keyword name="UncommitProjectHelper.initActions" id="UncommitProjectHelper.initActions" ref="eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.ProjectHelper.html#UncommitProjectHelper.initActions" /> + <keyword name="UncommitProjectHelper.initMenu" id="UncommitProjectHelper.initMenu" ref="eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.ProjectHelper.html#UncommitProjectHelper.initMenu" /> + <keyword name="UncommitProjectHelper.menuTitle" id="UncommitProjectHelper.menuTitle" ref="eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.ProjectHelper.html#UncommitProjectHelper.menuTitle" /> <keyword name="UnittestExecutor" id="UnittestExecutor" ref="eric7.Testing.Interfaces.UnittestExecutor.html#UnittestExecutor" /> <keyword name="UnittestExecutor (Constructor)" id="UnittestExecutor (Constructor)" ref="eric7.Testing.Interfaces.UnittestExecutor.html#UnittestExecutor.__init__" /> <keyword name="UnittestExecutor (Module)" id="UnittestExecutor (Module)" ref="eric7.Testing.Interfaces.UnittestExecutor.html" /> @@ -19285,6 +19304,7 @@ <keyword name="WebBrowserPage.__contentsSizeChanged" id="WebBrowserPage.__contentsSizeChanged" ref="eric7.WebBrowser.WebBrowserPage.html#WebBrowserPage.__contentsSizeChanged" /> <keyword name="WebBrowserPage.__featurePermissionRequested" id="WebBrowserPage.__featurePermissionRequested" ref="eric7.WebBrowser.WebBrowserPage.html#WebBrowserPage.__featurePermissionRequested" /> <keyword name="WebBrowserPage.__fullScreenRequested" id="WebBrowserPage.__fullScreenRequested" ref="eric7.WebBrowser.WebBrowserPage.html#WebBrowserPage.__fullScreenRequested" /> + <keyword name="WebBrowserPage.__permissionRequested" id="WebBrowserPage.__permissionRequested" ref="eric7.WebBrowser.WebBrowserPage.html#WebBrowserPage.__permissionRequested" /> <keyword name="WebBrowserPage.__registerProtocolHandlerRequested" id="WebBrowserPage.__registerProtocolHandlerRequested" ref="eric7.WebBrowser.WebBrowserPage.html#WebBrowserPage.__registerProtocolHandlerRequested" /> <keyword name="WebBrowserPage.__setupChannelTimeout" id="WebBrowserPage.__setupChannelTimeout" ref="eric7.WebBrowser.WebBrowserPage.html#WebBrowserPage.__setupChannelTimeout" /> <keyword name="WebBrowserPage.__setupWebChannelForUrl" id="WebBrowserPage.__setupWebChannelForUrl" ref="eric7.WebBrowser.WebBrowserPage.html#WebBrowserPage.__setupWebChannelForUrl" /> @@ -20615,6 +20635,7 @@ <keyword name="extraneous_whitespace" id="extraneous_whitespace" ref="eric7.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#extraneous_whitespace" /> <keyword name="factory" id="factory" ref="eric7.VCS.__init__.html#factory" /> <keyword name="factory" id="factory" ref="eric7.ViewManager.__init__.html#factory" /> + <keyword name="fastexport (Module)" id="fastexport (Module)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.fastexport.html" /> <keyword name="filename_match" id="filename_match" ref="eric7.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#filename_match" /> <keyword name="filterAnsiSequences" id="filterAnsiSequences" ref="eric7.Utilities.__init__.html#filterAnsiSequences" /> <keyword name="filterCharsFromFilename" id="filterCharsFromFilename" ref="eric7.WebBrowser.Tools.WebBrowserTools.html#filterCharsFromFilename" /> @@ -20969,6 +20990,7 @@ <keyword name="isNameConstant" id="isNameConstant" ref="eric7.Plugins.CheckerPlugins.CodeStyleChecker.AstUtilities.html#isNameConstant" /> <keyword name="isNumber" id="isNumber" ref="eric7.Plugins.CheckerPlugins.CodeStyleChecker.AstUtilities.html#isNumber" /> <keyword name="isPlainFileName" id="isPlainFileName" ref="eric7.SystemUtilities.FileSystemUtilities.html#isPlainFileName" /> + <keyword name="isProgressInfo" id="isProgressInfo" ref="eric7.Plugins.VcsPlugins.vcsMercurial.HgUtilities.html#isProgressInfo" /> <keyword name="isPythonProgram" id="isPythonProgram" ref="eric7.DebugClients.Python.DebugUtilities.html#isPythonProgram" /> <keyword name="isPythonSource" id="isPythonSource" ref="eric7.SystemUtilities.PythonUtilities.html#isPythonSource" /> <keyword name="isRemoteFileName" id="isRemoteFileName" ref="eric7.SystemUtilities.FileSystemUtilities.html#isRemoteFileName" /> @@ -21006,6 +21028,7 @@ <keyword name="load_families" id="load_families" ref="eric7.MicroPython.Tools.uf2conv.html#load_families" /> <keyword name="loggingConfigInsecureListen (Module)" id="loggingConfigInsecureListen (Module)" ref="eric7.Plugins.CheckerPlugins.CodeStyleChecker.Security.Checks.loggingConfigInsecureListen.html" /> <keyword name="main" id="main" ref="eric7.MicroPython.Tools.uf2conv.html#main" /> + <keyword name="main" id="main" ref="eric7.PipInterface.pipcleanup.html#main" /> <keyword name="main" id="main" ref="eric7.PipInterface.piplicenses.html#main" /> <keyword name="main" id="main" ref="eric7.Plugins.CheckerPlugins.CodeStyleChecker.Miscellaneous.eradicate.html#main" /> <keyword name="main" id="main" ref="eric7.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditEditor.html#main" /> @@ -21082,6 +21105,7 @@ <keyword name="okToClearData" id="okToClearData" ref="eric7.EricWidgets.EricMessageBox.html#okToClearData" /> <keyword name="pairwise" id="pairwise" ref="eric7.Plugins.CheckerPlugins.CodeStyleChecker.Miscellaneous.MiscellaneousChecker.html#pairwise" /> <keyword name="parseOptionString" id="parseOptionString" ref="eric7.Utilities.__init__.html#parseOptionString" /> + <keyword name="parseProgressInfo" id="parseProgressInfo" ref="eric7.Plugins.VcsPlugins.vcsMercurial.HgUtilities.html#parseProgressInfo" /> <keyword name="parse_udiff" id="parse_udiff" ref="eric7.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#parse_udiff" /> <keyword name="patchArgumentStringWindows" id="patchArgumentStringWindows" ref="eric7.DebugClients.Python.DebugUtilities.html#patchArgumentStringWindows" /> <keyword name="patchArguments" id="patchArguments" ref="eric7.DebugClients.Python.DebugUtilities.html#patchArguments" /> @@ -21092,6 +21116,7 @@ <keyword name="patchSubprocess" id="patchSubprocess" ref="eric7.DebugClients.Python.SubprocessExtension.html#patchSubprocess" /> <keyword name="patch_circup" id="patch_circup" ref="eric7.MicroPython.Devices.CircuitPythonUpdater.CircupFunctions.html#patch_circup" /> <keyword name="pbkdf2" id="pbkdf2" ref="eric7.EricUtilities.crypto.py3PBKDF2.html#pbkdf2" /> + <keyword name="pipcleanup (Module)" id="pipcleanup (Module)" ref="eric7.PipInterface.pipcleanup.html" /> <keyword name="piplicenses (Module)" id="piplicenses (Module)" ref="eric7.PipInterface.piplicenses.html" /> <keyword name="pixmapFileToDataUrl" id="pixmapFileToDataUrl" ref="eric7.WebBrowser.Tools.WebBrowserTools.html#pixmapFileToDataUrl" /> <keyword name="pixmapFromByteArray" id="pixmapFromByteArray" ref="eric7.WebBrowser.Tools.WebBrowserTools.html#pixmapFromByteArray" /> @@ -21118,7 +21143,7 @@ <keyword name="prohibitedCalls (Module)" id="prohibitedCalls (Module)" ref="eric7.Plugins.CheckerPlugins.CodeStyleChecker.Security.Checks.prohibitedCalls.html" /> <keyword name="prohibitedImports (Module)" id="prohibitedImports (Module)" ref="eric7.Plugins.CheckerPlugins.CodeStyleChecker.Security.Checks.prohibitedImports.html" /> <keyword name="proxyAuthenticationRequired" id="proxyAuthenticationRequired" ref="eric7.EricNetwork.EricNetworkProxyFactory.html#proxyAuthenticationRequired" /> - <keyword name="purge (Module)" id="purge (Module)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.purge.html" /> + <keyword name="purge (Module)" id="purge (Module)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.purge.html" /> <keyword name="pushView" id="pushView" ref="eric7.WebBrowser.WebInspector.html#pushView" /> <keyword name="pwConvert" id="pwConvert" ref="eric7.EricUtilities.crypto.__init__.html#pwConvert" /> <keyword name="pwDecode" id="pwDecode" ref="eric7.EricUtilities.crypto.__init__.html#pwDecode" /> @@ -21262,7 +21287,7 @@ <keyword name="setupWebChannel" id="setupWebChannel" ref="eric7.WebBrowser.Tools.Scripts.html#setupWebChannel" /> <keyword name="setupWindowObject" id="setupWindowObject" ref="eric7.WebBrowser.Tools.Scripts.html#setupWindowObject" /> <keyword name="shannonEntropy" id="shannonEntropy" ref="eric7.Plugins.CheckerPlugins.CodeStyleChecker.Security.Checks.awsHardcodedPassword.html#shannonEntropy" /> - <keyword name="shelve (Module)" id="shelve (Module)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.shelve.html" /> + <keyword name="shelve (Module)" id="shelve (Module)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.shelve.html" /> <keyword name="shouldResetLayout" id="shouldResetLayout" ref="eric7.Preferences.__init__.html#shouldResetLayout" /> <keyword name="showTeensyFlashInstructions" id="showTeensyFlashInstructions" ref="eric7.MicroPython.Devices.TeensyDevices.html#showTeensyFlashInstructions" /> <keyword name="showwarning" id="showwarning" ref="eric7.Plugins.CheckerPlugins.SyntaxChecker.pyCheckSyntax.html#showwarning" /> @@ -21284,7 +21309,6 @@ <keyword name="strGroup" id="strGroup" ref="eric7.EricUtilities.__init__.html#strGroup" /> <keyword name="strToQByteArray" id="strToQByteArray" ref="eric7.EricUtilities.__init__.html#strToQByteArray" /> <keyword name="stringToArgumentsWindows" id="stringToArgumentsWindows" ref="eric7.DebugClients.Python.DebugUtilities.html#stringToArgumentsWindows" /> - <keyword name="strip (Module)" id="strip (Module)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.strip.html" /> <keyword name="strip_PKCS7_padding" id="strip_PKCS7_padding" ref="eric7.EricUtilities.crypto.py3AES.html#strip_PKCS7_padding" /> <keyword name="subversion (Module)" id="subversion (Module)" ref="eric7.Plugins.VcsPlugins.vcsPySvn.subversion.html" /> <keyword name="subversion (Module)" id="subversion (Module)" ref="eric7.Plugins.VcsPlugins.vcsSubversion.subversion.html" /> @@ -21331,6 +21355,7 @@ <keyword name="uf2conv (Module)" id="uf2conv (Module)" ref="eric7.MicroPython.Tools.uf2conv.html" /> <keyword name="uiStartUp" id="uiStartUp" ref="eric7.eric7_ide.html#uiStartUp" /> <keyword name="uic (Module)" id="uic (Module)" ref="eric7.Utilities.uic.html" /> + <keyword name="uncommit (Module)" id="uncommit (Module)" ref="eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.uncommit.html" /> <keyword name="unescape_uentities" id="unescape_uentities" ref="eric7.EricUtilities.__init__.html#unescape_uentities" /> <keyword name="unparse" id="unparse" ref="eric7.Plugins.CheckerPlugins.CodeStyleChecker.ast_unparse.html#unparse" /> <keyword name="unregisterClassBrowser" id="unregisterClassBrowser" ref="eric7.Utilities.ClassBrowsers.__init__.html#unregisterClassBrowser" /> @@ -21685,6 +21710,7 @@ <file>eric7.PipInterface.PipPackagesWidget.html</file> <file>eric7.PipInterface.PipPackagesWindow.html</file> <file>eric7.PipInterface.PipVulnerabilityChecker.html</file> + <file>eric7.PipInterface.pipcleanup.html</file> <file>eric7.PipInterface.pipdeptree.html</file> <file>eric7.PipInterface.piplicenses.html</file> <file>eric7.PluginManager.PluginDetailsDialog.html</file> @@ -21899,6 +21925,9 @@ <file>eric7.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.closehead.html</file> <file>eric7.Plugins.VcsPlugins.vcsMercurial.Config.html</file> <file>eric7.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.html</file> + <file>eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.HgFastexportConfigDialog.html</file> + <file>eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.ProjectHelper.html</file> + <file>eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.fastexport.html</file> <file>eric7.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignDialog.html</file> <file>eric7.Plugins.VcsPlugins.vcsMercurial.GpgExtension.HgGpgSignaturesDialog.html</file> <file>eric7.Plugins.VcsPlugins.vcsMercurial.GpgExtension.ProjectHelper.html</file> @@ -21962,9 +21991,9 @@ <file>eric7.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.largefiles.html</file> <file>eric7.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html</file> <file>eric7.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html</file> - <file>eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.HgPurgeListDialog.html</file> - <file>eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.ProjectHelper.html</file> - <file>eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.purge.html</file> + <file>eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.HgPurgeListDialog.html</file> + <file>eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.ProjectHelper.html</file> + <file>eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.purge.html</file> <file>eric7.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesDefineGuardsDialog.html</file> <file>eric7.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesFoldDialog.html</file> <file>eric7.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesGuardsSelectionDialog.html</file> @@ -21980,16 +22009,17 @@ <file>eric7.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.HgRebaseDialog.html</file> <file>eric7.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.ProjectHelper.html</file> <file>eric7.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.rebase.html</file> - <file>eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.html</file> - <file>eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveDataDialog.html</file> - <file>eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelvesSelectionDialog.html</file> - <file>eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgUnshelveDataDialog.html</file> - <file>eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectBrowserHelper.html</file> - <file>eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectHelper.html</file> - <file>eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.shelve.html</file> - <file>eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.HgStripDialog.html</file> - <file>eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.ProjectHelper.html</file> - <file>eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.strip.html</file> + <file>eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveBrowserDialog.html</file> + <file>eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveDataDialog.html</file> + <file>eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelvesSelectionDialog.html</file> + <file>eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgUnshelveDataDialog.html</file> + <file>eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.ProjectBrowserHelper.html</file> + <file>eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.ProjectHelper.html</file> + <file>eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.shelve.html</file> + <file>eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.HgUncommitDialog.html</file> + <file>eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.ProjectBrowserHelper.html</file> + <file>eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.ProjectHelper.html</file> + <file>eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.uncommit.html</file> <file>eric7.Plugins.VcsPlugins.vcsMercurial.hg.html</file> <file>eric7.Plugins.VcsPlugins.vcsPySvn.Config.html</file> <file>eric7.Plugins.VcsPlugins.vcsPySvn.ConfigurationPage.SubversionPage.html</file> @@ -22720,14 +22750,15 @@ <file>index-eric7.Plugins.VcsPlugins.vcsGit.html</file> <file>index-eric7.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.html</file> <file>index-eric7.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.html</file> + <file>index-eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.html</file> <file>index-eric7.Plugins.VcsPlugins.vcsMercurial.GpgExtension.html</file> <file>index-eric7.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.html</file> <file>index-eric7.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.html</file> - <file>index-eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.html</file> + <file>index-eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.html</file> <file>index-eric7.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.html</file> <file>index-eric7.Plugins.VcsPlugins.vcsMercurial.RebaseExtension.html</file> - <file>index-eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.html</file> - <file>index-eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.html</file> + <file>index-eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.html</file> + <file>index-eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.html</file> <file>index-eric7.Plugins.VcsPlugins.vcsMercurial.html</file> <file>index-eric7.Plugins.VcsPlugins.vcsPySvn.ConfigurationPage.html</file> <file>index-eric7.Plugins.VcsPlugins.vcsPySvn.html</file>
--- a/src/eric7/Documentation/Source/eric7.DebugClients.Python.DebugUtilities.html Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Documentation/Source/eric7.DebugClients.Python.DebugUtilities.html Tue Jan 14 17:29:56 2025 +0100 @@ -248,7 +248,7 @@ <hr /> <a NAME="isPythonProgram" ID="isPythonProgram"></a> <h2>isPythonProgram</h2> -<b>isPythonProgram</b>(<i>program</i>) +<b>isPythonProgram</b>(<i>program, withPath=False</i>) <p> Function to check, if the given program is a Python interpreter or program. @@ -260,6 +260,11 @@ <dd> program to be checked </dd> +<dt><i>withPath</i> (bool (optional))</dt> +<dd> +flag indicating to search the program in the executable + search path (defaults to False) +</dd> </dl> <dl> <dt>Return:</dt> @@ -333,7 +338,7 @@ <hr /> <a NAME="patchArguments" ID="patchArguments"></a> <h2>patchArguments</h2> -<b>patchArguments</b>(<i>debugClient, arguments, noRedirect=False</i>) +<b>patchArguments</b>(<i>debugClient, arguments, noRedirect=False, isPythonProg=False</i>) <p> Function to patch the arguments given to start a program in order to execute it in our debugger. @@ -349,9 +354,14 @@ <dd> list of program arguments </dd> -<dt><i>noRedirect</i> (bool)</dt> +<dt><i>noRedirect</i> (bool (optional))</dt> <dd> flag indicating to not redirect stdin and stdout + (defaults to False) +</dd> +<dt><i>isPythonProg</i> (bool (optional))</dt> +<dd> +flag indicating a Python script (defaults to False) </dd> </dl> <dl>
--- a/src/eric7/Documentation/Source/eric7.PipInterface.Pip.html Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Documentation/Source/eric7.PipInterface.Pip.html Tue Jan 14 17:29:56 2025 +0100 @@ -187,6 +187,10 @@ <td>Public method to repair the pip installation.</td> </tr> <tr> +<td><a href="#Pip.runCleanup">runCleanup</a></td> +<td>Public method to perform a cleanup run for a given environment.</td> +</tr> +<tr> <td><a href="#Pip.runProcess">runProcess</a></td> <td>Public method to execute the current pip with the given arguments.</td> </tr> @@ -1045,6 +1049,34 @@ name of the environment to install pip into </dd> </dl> +<a NAME="Pip.runCleanup" ID="Pip.runCleanup"></a> +<h4>Pip.runCleanup</h4> +<b>runCleanup</b>(<i>envName</i>) +<p> + Public method to perform a cleanup run for a given environment. +</p> + +<dl> + +<dt><i>envName</i> (str)</dt> +<dd> +name of the environment to get the licenses for +</dd> +</dl> +<dl> +<dt>Return:</dt> +<dd> +flag indicating a successful removal. A missing environment + name or an undefined Python interpreter is treated as success + (i.e. nothing to do). +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl> <a NAME="Pip.runProcess" ID="Pip.runProcess"></a> <h4>Pip.runProcess</h4> <b>runProcess</b>(<i>args, interpreter</i>)
--- a/src/eric7/Documentation/Source/eric7.PipInterface.PipPackagesWidget.html Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Documentation/Source/eric7.PipInterface.PipPackagesWidget.html Tue Jan 14 17:29:56 2025 +0100 @@ -26,10 +26,6 @@ <td><a href="#PipPackagesWidget">PipPackagesWidget</a></td> <td>Class implementing the pip packages management widget.</td> </tr> -<tr> -<td><a href="#PypiSearchResultsParser">PypiSearchResultsParser</a></td> -<td>Class implementing the parser for the PyPI search result page.</td> -</tr> </table> <h3>Functions</h3> @@ -152,10 +148,6 @@ <td>Private slot to edit the configuration of the selected environment.</td> </tr> <tr> -<td><a href="#PipPackagesWidget.__finishSearch">__finishSearch</a></td> -<td>Private slot performing the search finishing actions.</td> -</tr> -<tr> <td><a href="#PipPackagesWidget.__generateConstraints">__generateConstraints</a></td> <td>Private slot to generate the contents for a constraints file.</td> </tr> @@ -236,18 +228,6 @@ <td>Private slot to repair the pip installation of the selected environment.</td> </tr> <tr> -<td><a href="#PipPackagesWidget.__search">__search</a></td> -<td>Private method to perform the search by calling the PyPI search URL.</td> -</tr> -<tr> -<td><a href="#PipPackagesWidget.__searchFirst">__searchFirst</a></td> -<td>Private method to perform the search for packages.</td> -</tr> -<tr> -<td><a href="#PipPackagesWidget.__searchResponse">__searchResponse</a></td> -<td>Private method to extract the search result data from the response.</td> -</tr> -<tr> <td><a href="#PipPackagesWidget.__selectedUpdateableItems">__selectedUpdateableItems</a></td> <td>Private method to get a list of selected items that can be updated.</td> </tr> @@ -272,10 +252,6 @@ <td>Private method to show information for a package.</td> </tr> <tr> -<td><a href="#PipPackagesWidget.__showSearchedDetails">__showSearchedDetails</a></td> -<td>Private slot to show details about the selected search result package.</td> -</tr> -<tr> <td><a href="#PipPackagesWidget.__showVulnerabilityInformation">__showVulnerabilityInformation</a></td> <td>Private method to show the detected vulnerability data.</td> </tr> @@ -300,18 +276,6 @@ <td>Private method to process the list of outdated packages.</td> </tr> <tr> -<td><a href="#PipPackagesWidget.__updateSearchActionButtons">__updateSearchActionButtons</a></td> -<td>Private method to update the action button states of the search widget.</td> -</tr> -<tr> -<td><a href="#PipPackagesWidget.__updateSearchButton">__updateSearchButton</a></td> -<td>Private method to update the state of the search button.</td> -</tr> -<tr> -<td><a href="#PipPackagesWidget.__updateSearchMoreButton">__updateSearchMoreButton</a></td> -<td>Private method to update the state of the search more button.</td> -</tr> -<tr> <td><a href="#PipPackagesWidget.__updateVulnerabilityData">__updateVulnerabilityData</a></td> <td>Private slot to update the shown vulnerability info.</td> </tr> @@ -336,6 +300,10 @@ <td>Public method to get a reference to the pip interface object.</td> </tr> <tr> +<td><a href="#PipPackagesWidget.on_cleanupButton_clicked">on_cleanupButton_clicked</a></td> +<td>Private slot to cleanup the site-packages directory of the selected environment.</td> +</tr> +<tr> <td><a href="#PipPackagesWidget.on_dependenciesList_itemActivated">on_dependenciesList_itemActivated</a></td> <td>Private slot reacting on a package item of the dependency tree being activated.</td> </tr> @@ -360,14 +328,6 @@ <td>Private slot handling the selection of a Python environment.</td> </tr> <tr> -<td><a href="#PipPackagesWidget.on_installButton_clicked">on_installButton_clicked</a></td> -<td>Private slot to handle pressing the Install button..</td> -</tr> -<tr> -<td><a href="#PipPackagesWidget.on_installUserSiteButton_clicked">on_installUserSiteButton_clicked</a></td> -<td>Private slot to handle pressing the Install to User-Site button..</td> -</tr> -<tr> <td><a href="#PipPackagesWidget.on_installedFilesCheckBox_clicked">on_installedFilesCheckBox_clicked</a></td> <td>Private slot to handle a change of the installed files information checkbox.</td> </tr> @@ -405,45 +365,17 @@ </tr> <tr> <td><a href="#PipPackagesWidget.on_searchButton_clicked">on_searchButton_clicked</a></td> -<td>Private slot handling a press of the search button.</td> -</tr> -<tr> -<td><a href="#PipPackagesWidget.on_searchMoreButton_clicked">on_searchMoreButton_clicked</a></td> -<td>Private slot handling a press of the search more button.</td> -</tr> -<tr> -<td><a href="#PipPackagesWidget.on_searchNameEdit_returnPressed">on_searchNameEdit_returnPressed</a></td> -<td>Private slot initiating a search via a press of the Return key.</td> -</tr> -<tr> -<td><a href="#PipPackagesWidget.on_searchNameEdit_textChanged">on_searchNameEdit_textChanged</a></td> -<td>Private slot handling a change of the search term.</td> +<td>Private slot to open a web browser for package searching.</td> </tr> <tr> -<td><a href="#PipPackagesWidget.on_searchResultList_itemActivated">on_searchResultList_itemActivated</a></td> -<td>Private slot reacting on an search result item activation.</td> -</tr> -<tr> -<td><a href="#PipPackagesWidget.on_searchResultList_itemSelectionChanged">on_searchResultList_itemSelectionChanged</a></td> -<td>Private slot handling changes of the search result selection.</td> -</tr> -<tr> -<td><a href="#PipPackagesWidget.on_searchToggleButton_1_toggled">on_searchToggleButton_1_toggled</a></td> -<td>Private slot to toggle the search widget.</td> -</tr> -<tr> -<td><a href="#PipPackagesWidget.on_searchToggleButton_2_toggled">on_searchToggleButton_2_toggled</a></td> -<td>Private slot to toggle the search widget.</td> +<td><a href="#PipPackagesWidget.on_searchEdit_returnPressed">on_searchEdit_returnPressed</a></td> +<td>Private slot to handle the press of the Return key in the search line edit.</td> </tr> <tr> <td><a href="#PipPackagesWidget.on_showDepPackageDetailsButton_clicked">on_showDepPackageDetailsButton_clicked</a></td> <td>Private slot to show information for the selected package of the dependency tree.</td> </tr> <tr> -<td><a href="#PipPackagesWidget.on_showDetailsButton_clicked">on_showDetailsButton_clicked</a></td> -<td>Private slot to handle pressing the Show Details button.</td> -</tr> -<tr> <td><a href="#PipPackagesWidget.on_showPackageDetailsButton_clicked">on_showPackageDetailsButton_clicked</a></td> <td>Private slot to show information for the selected package.</td> </tr> @@ -645,13 +577,6 @@ Private slot to edit the configuration of the selected environment. </p> -<a NAME="PipPackagesWidget.__finishSearch" ID="PipPackagesWidget.__finishSearch"></a> -<h4>PipPackagesWidget.__finishSearch</h4> -<b>__finishSearch</b>(<i></i>) -<p> - Private slot performing the search finishing actions. -</p> - <a NAME="PipPackagesWidget.__generateConstraints" ID="PipPackagesWidget.__generateConstraints"></a> <h4>PipPackagesWidget.__generateConstraints</h4> <b>__generateConstraints</b>(<i></i>) @@ -815,41 +740,6 @@ environment. </p> -<a NAME="PipPackagesWidget.__search" ID="PipPackagesWidget.__search"></a> -<h4>PipPackagesWidget.__search</h4> -<b>__search</b>(<i>page=1</i>) -<p> - Private method to perform the search by calling the PyPI search URL. -</p> - -<dl> - -<dt><i>page</i> (int (optional))</dt> -<dd> -search page to retrieve (defaults to 1) -</dd> -</dl> -<a NAME="PipPackagesWidget.__searchFirst" ID="PipPackagesWidget.__searchFirst"></a> -<h4>PipPackagesWidget.__searchFirst</h4> -<b>__searchFirst</b>(<i></i>) -<p> - Private method to perform the search for packages. -</p> - -<a NAME="PipPackagesWidget.__searchResponse" ID="PipPackagesWidget.__searchResponse"></a> -<h4>PipPackagesWidget.__searchResponse</h4> -<b>__searchResponse</b>(<i>reply</i>) -<p> - Private method to extract the search result data from the response. -</p> - -<dl> - -<dt><i>reply</i> (QNetworkReply)</dt> -<dd> -reference to the reply object containing the data -</dd> -</dl> <a NAME="PipPackagesWidget.__selectedUpdateableItems" ID="PipPackagesWidget.__selectedUpdateableItems"></a> <h4>PipPackagesWidget.__selectedUpdateableItems</h4> <b>__selectedUpdateableItems</b>(<i></i>) @@ -941,20 +831,6 @@ reference to the widget to contain the information </dd> </dl> -<a NAME="PipPackagesWidget.__showSearchedDetails" ID="PipPackagesWidget.__showSearchedDetails"></a> -<h4>PipPackagesWidget.__showSearchedDetails</h4> -<b>__showSearchedDetails</b>(<i>item=None</i>) -<p> - Private slot to show details about the selected search result package. -</p> - -<dl> - -<dt><i>item</i> (QTreeWidgetItem)</dt> -<dd> -reference to the search result item to show details for -</dd> -</dl> <a NAME="PipPackagesWidget.__showVulnerabilityInformation" ID="PipPackagesWidget.__showVulnerabilityInformation"></a> <h4>PipPackagesWidget.__showVulnerabilityInformation</h4> <b>__showVulnerabilityInformation</b>(<i>packageName, packageVersion, vulnerabilities</i>) @@ -1020,34 +896,6 @@ a tuple containing the installed and available version as the value </dd> </dl> -<a NAME="PipPackagesWidget.__updateSearchActionButtons" ID="PipPackagesWidget.__updateSearchActionButtons"></a> -<h4>PipPackagesWidget.__updateSearchActionButtons</h4> -<b>__updateSearchActionButtons</b>(<i></i>) -<p> - Private method to update the action button states of the search widget. -</p> - -<a NAME="PipPackagesWidget.__updateSearchButton" ID="PipPackagesWidget.__updateSearchButton"></a> -<h4>PipPackagesWidget.__updateSearchButton</h4> -<b>__updateSearchButton</b>(<i></i>) -<p> - Private method to update the state of the search button. -</p> - -<a NAME="PipPackagesWidget.__updateSearchMoreButton" ID="PipPackagesWidget.__updateSearchMoreButton"></a> -<h4>PipPackagesWidget.__updateSearchMoreButton</h4> -<b>__updateSearchMoreButton</b>(<i>enable</i>) -<p> - Private method to update the state of the search more button. -</p> - -<dl> - -<dt><i>enable</i> (bool)</dt> -<dd> -flag indicating the desired enable state -</dd> -</dl> <a NAME="PipPackagesWidget.__updateVulnerabilityData" ID="PipPackagesWidget.__updateVulnerabilityData"></a> <h4>PipPackagesWidget.__updateVulnerabilityData</h4> <b>__updateVulnerabilityData</b>(<i>clearFirst=True</i>) @@ -1136,6 +984,14 @@ Pip </dd> </dl> +<a NAME="PipPackagesWidget.on_cleanupButton_clicked" ID="PipPackagesWidget.on_cleanupButton_clicked"></a> +<h4>PipPackagesWidget.on_cleanupButton_clicked</h4> +<b>on_cleanupButton_clicked</b>(<i></i>) +<p> + Private slot to cleanup the site-packages directory of the selected + environment. +</p> + <a NAME="PipPackagesWidget.on_dependenciesList_itemActivated" ID="PipPackagesWidget.on_dependenciesList_itemActivated"></a> <h4>PipPackagesWidget.on_dependenciesList_itemActivated</h4> <b>on_dependenciesList_itemActivated</b>(<i>item, column</i>) @@ -1210,20 +1066,6 @@ name of the selected Python environment </dd> </dl> -<a NAME="PipPackagesWidget.on_installButton_clicked" ID="PipPackagesWidget.on_installButton_clicked"></a> -<h4>PipPackagesWidget.on_installButton_clicked</h4> -<b>on_installButton_clicked</b>(<i></i>) -<p> - Private slot to handle pressing the Install button.. -</p> - -<a NAME="PipPackagesWidget.on_installUserSiteButton_clicked" ID="PipPackagesWidget.on_installUserSiteButton_clicked"></a> -<h4>PipPackagesWidget.on_installUserSiteButton_clicked</h4> -<b>on_installUserSiteButton_clicked</b>(<i></i>) -<p> - Private slot to handle pressing the Install to User-Site button.. -</p> - <a NAME="PipPackagesWidget.on_installedFilesCheckBox_clicked" ID="PipPackagesWidget.on_installedFilesCheckBox_clicked"></a> <h4>PipPackagesWidget.on_installedFilesCheckBox_clicked</h4> <b>on_installedFilesCheckBox_clicked</b>(<i>checked</i>) @@ -1317,90 +1159,16 @@ <h4>PipPackagesWidget.on_searchButton_clicked</h4> <b>on_searchButton_clicked</b>(<i></i>) <p> - Private slot handling a press of the search button. -</p> - -<a NAME="PipPackagesWidget.on_searchMoreButton_clicked" ID="PipPackagesWidget.on_searchMoreButton_clicked"></a> -<h4>PipPackagesWidget.on_searchMoreButton_clicked</h4> -<b>on_searchMoreButton_clicked</b>(<i></i>) -<p> - Private slot handling a press of the search more button. -</p> - -<a NAME="PipPackagesWidget.on_searchNameEdit_returnPressed" ID="PipPackagesWidget.on_searchNameEdit_returnPressed"></a> -<h4>PipPackagesWidget.on_searchNameEdit_returnPressed</h4> -<b>on_searchNameEdit_returnPressed</b>(<i></i>) -<p> - Private slot initiating a search via a press of the Return key. -</p> - -<a NAME="PipPackagesWidget.on_searchNameEdit_textChanged" ID="PipPackagesWidget.on_searchNameEdit_textChanged"></a> -<h4>PipPackagesWidget.on_searchNameEdit_textChanged</h4> -<b>on_searchNameEdit_textChanged</b>(<i>_txt</i>) -<p> - Private slot handling a change of the search term. -</p> - -<dl> - -<dt><i>_txt</i> (str)</dt> -<dd> -search term (unused) -</dd> -</dl> -<a NAME="PipPackagesWidget.on_searchResultList_itemActivated" ID="PipPackagesWidget.on_searchResultList_itemActivated"></a> -<h4>PipPackagesWidget.on_searchResultList_itemActivated</h4> -<b>on_searchResultList_itemActivated</b>(<i>item, column</i>) -<p> - Private slot reacting on an search result item activation. + Private slot to open a web browser for package searching. </p> -<dl> - -<dt><i>item</i> (QTreeWidgetItem)</dt> -<dd> -reference to the activated item -</dd> -<dt><i>column</i> (int)</dt> -<dd> -activated column -</dd> -</dl> -<a NAME="PipPackagesWidget.on_searchResultList_itemSelectionChanged" ID="PipPackagesWidget.on_searchResultList_itemSelectionChanged"></a> -<h4>PipPackagesWidget.on_searchResultList_itemSelectionChanged</h4> -<b>on_searchResultList_itemSelectionChanged</b>(<i></i>) +<a NAME="PipPackagesWidget.on_searchEdit_returnPressed" ID="PipPackagesWidget.on_searchEdit_returnPressed"></a> +<h4>PipPackagesWidget.on_searchEdit_returnPressed</h4> +<b>on_searchEdit_returnPressed</b>(<i></i>) <p> - Private slot handling changes of the search result selection. + Private slot to handle the press of the Return key in the search line edit. </p> -<a NAME="PipPackagesWidget.on_searchToggleButton_1_toggled" ID="PipPackagesWidget.on_searchToggleButton_1_toggled"></a> -<h4>PipPackagesWidget.on_searchToggleButton_1_toggled</h4> -<b>on_searchToggleButton_1_toggled</b>(<i>checked</i>) -<p> - Private slot to toggle the search widget. -</p> - -<dl> - -<dt><i>checked</i> (bool)</dt> -<dd> -state of the search widget button -</dd> -</dl> -<a NAME="PipPackagesWidget.on_searchToggleButton_2_toggled" ID="PipPackagesWidget.on_searchToggleButton_2_toggled"></a> -<h4>PipPackagesWidget.on_searchToggleButton_2_toggled</h4> -<b>on_searchToggleButton_2_toggled</b>(<i>checked</i>) -<p> - Private slot to toggle the search widget. -</p> - -<dl> - -<dt><i>checked</i> (bool)</dt> -<dd> -state of the search widget button -</dd> -</dl> <a NAME="PipPackagesWidget.on_showDepPackageDetailsButton_clicked" ID="PipPackagesWidget.on_showDepPackageDetailsButton_clicked"></a> <h4>PipPackagesWidget.on_showDepPackageDetailsButton_clicked</h4> <b>on_showDepPackageDetailsButton_clicked</b>(<i></i>) @@ -1409,13 +1177,6 @@ dependency tree. </p> -<a NAME="PipPackagesWidget.on_showDetailsButton_clicked" ID="PipPackagesWidget.on_showDetailsButton_clicked"></a> -<h4>PipPackagesWidget.on_showDetailsButton_clicked</h4> -<b>on_showDetailsButton_clicked</b>(<i></i>) -<p> - Private slot to handle pressing the Show Details button. -</p> - <a NAME="PipPackagesWidget.on_showPackageDetailsButton_clicked" ID="PipPackagesWidget.on_showPackageDetailsButton_clicked"></a> <h4>PipPackagesWidget.on_showPackageDetailsButton_clicked</h4> <b>on_showPackageDetailsButton_clicked</b>(<i></i>) @@ -1524,196 +1285,4 @@ </dl> <div align="right"><a href="#top">Up</a></div> <hr /> -<hr /> -<a NAME="PypiSearchResultsParser" ID="PypiSearchResultsParser"></a> -<h2>PypiSearchResultsParser</h2> -<p> - Class implementing the parser for the PyPI search result page. -</p> - -<h3>Derived from</h3> -html.parser.HTMLParser -<h3>Class Attributes</h3> -<table> -<tr><td>ClassPrefix</td></tr> -</table> - -<h3>Class Methods</h3> -<table> -<tr><td>None</td></tr> -</table> - -<h3>Methods</h3> -<table> -<tr> -<td><a href="#PypiSearchResultsParser.__init__">PypiSearchResultsParser</a></td> -<td>Constructor</td> -</tr> -<tr> -<td><a href="#PypiSearchResultsParser.__getClass">__getClass</a></td> -<td>Private method to extract the class attribute out of the list of attributes.</td> -</tr> -<tr> -<td><a href="#PypiSearchResultsParser.__getDate">__getDate</a></td> -<td>Private method to extract the datetime attribute out of the list of attributes and process it.</td> -</tr> -<tr> -<td><a href="#PypiSearchResultsParser.getResults">getResults</a></td> -<td>Public method to get the extracted search results.</td> -</tr> -<tr> -<td><a href="#PypiSearchResultsParser.handle_data">handle_data</a></td> -<td>Public method process arbitrary data.</td> -</tr> -<tr> -<td><a href="#PypiSearchResultsParser.handle_endtag">handle_endtag</a></td> -<td>Public method to process the end tag.</td> -</tr> -<tr> -<td><a href="#PypiSearchResultsParser.handle_starttag">handle_starttag</a></td> -<td>Public method to process the start tag.</td> -</tr> -</table> - -<h3>Static Methods</h3> -<table> -<tr><td>None</td></tr> -</table> - - -<a NAME="PypiSearchResultsParser.__init__" ID="PypiSearchResultsParser.__init__"></a> -<h4>PypiSearchResultsParser (Constructor)</h4> -<b>PypiSearchResultsParser</b>(<i>data</i>) -<p> - Constructor -</p> - -<dl> - -<dt><i>data</i> (str)</dt> -<dd> -data to be parsed -</dd> -</dl> -<a NAME="PypiSearchResultsParser.__getClass" ID="PypiSearchResultsParser.__getClass"></a> -<h4>PypiSearchResultsParser.__getClass</h4> -<b>__getClass</b>(<i>attrs</i>) -<p> - Private method to extract the class attribute out of the list of - attributes. -</p> - -<dl> - -<dt><i>attrs</i> (list of tuple of (str, str))</dt> -<dd> -list of tag attributes as (name, value) tuples -</dd> -</dl> -<dl> -<dt>Return:</dt> -<dd> -value of the 'class' attribute or None -</dd> -</dl> -<dl> -<dt>Return Type:</dt> -<dd> -str -</dd> -</dl> -<a NAME="PypiSearchResultsParser.__getDate" ID="PypiSearchResultsParser.__getDate"></a> -<h4>PypiSearchResultsParser.__getDate</h4> -<b>__getDate</b>(<i>attrs</i>) -<p> - Private method to extract the datetime attribute out of the list of - attributes and process it. -</p> - -<dl> - -<dt><i>attrs</i> (list of tuple of (str, str))</dt> -<dd> -list of tag attributes as (name, value) tuples -</dd> -</dl> -<dl> -<dt>Return:</dt> -<dd> -value of the 'class' attribute or None -</dd> -</dl> -<dl> -<dt>Return Type:</dt> -<dd> -str -</dd> -</dl> -<a NAME="PypiSearchResultsParser.getResults" ID="PypiSearchResultsParser.getResults"></a> -<h4>PypiSearchResultsParser.getResults</h4> -<b>getResults</b>(<i></i>) -<p> - Public method to get the extracted search results. -</p> - -<dl> -<dt>Return:</dt> -<dd> -extracted result data -</dd> -</dl> -<dl> -<dt>Return Type:</dt> -<dd> -list of dict -</dd> -</dl> -<a NAME="PypiSearchResultsParser.handle_data" ID="PypiSearchResultsParser.handle_data"></a> -<h4>PypiSearchResultsParser.handle_data</h4> -<b>handle_data</b>(<i>data</i>) -<p> - Public method process arbitrary data. -</p> - -<dl> - -<dt><i>data</i> (str)</dt> -<dd> -data to be processed -</dd> -</dl> -<a NAME="PypiSearchResultsParser.handle_endtag" ID="PypiSearchResultsParser.handle_endtag"></a> -<h4>PypiSearchResultsParser.handle_endtag</h4> -<b>handle_endtag</b>(<i>_tag</i>) -<p> - Public method to process the end tag. -</p> - -<dl> - -<dt><i>_tag</i> (str)</dt> -<dd> -tag name (all lowercase) (unused) -</dd> -</dl> -<a NAME="PypiSearchResultsParser.handle_starttag" ID="PypiSearchResultsParser.handle_starttag"></a> -<h4>PypiSearchResultsParser.handle_starttag</h4> -<b>handle_starttag</b>(<i>tag, attrs</i>) -<p> - Public method to process the start tag. -</p> - -<dl> - -<dt><i>tag</i> (str)</dt> -<dd> -tag name (all lowercase) -</dd> -<dt><i>attrs</i> (list of tuple of (str, str))</dt> -<dd> -list of tag attributes as (name, value) tuples -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /> </body></html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Documentation/Source/eric7.PipInterface.pipcleanup.html Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,48 @@ +<!DOCTYPE html> +<html><head> +<title>eric7.PipInterface.pipcleanup</title> +<meta charset="UTF-8"> +<link rel="stylesheet" href="styles.css"> +</head> +<body> +<a NAME="top" ID="top"></a> +<h1>eric7.PipInterface.pipcleanup</h1> +<p> +pipcleanup utility script. +</p> +<p> +Script to delete all leftovers of upgrading packages currently in use. These +leftover directories are still located in the 'site-packages' directory and +their names start with a '~' character. +</p> + +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Classes</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Functions</h3> +<table> +<tr> +<td><a href="#main">main</a></td> +<td>Function implementing the main logic.</td> +</tr> +</table> + +<hr /> +<hr /> +<a NAME="main" ID="main"></a> +<h2>main</h2> +<b>main</b>(<i></i>) +<p> + Function implementing the main logic. +</p> + +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html>
--- a/src/eric7/Documentation/Source/eric7.PluginManager.PluginRepositoryDialog.html Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Documentation/Source/eric7.PluginManager.PluginRepositoryDialog.html Tue Jan 14 17:29:56 2025 +0100 @@ -174,6 +174,10 @@ <td>Constructor</td> </tr> <tr> +<td><a href="#PluginRepositoryWidget.__addPluginItem">__addPluginItem</a></td> +<td>Private method to add an item for the given plugin parameters.</td> +</tr> +<tr> <td><a href="#PluginRepositoryWidget.__changeScheme">__changeScheme</a></td> <td>Private method to change the scheme of the given URL.</td> </tr> @@ -254,10 +258,6 @@ <td>Private slot handling reachability state changes.</td> </tr> <tr> -<td><a href="#PluginRepositoryWidget.__resortRepositoryList">__resortRepositoryList</a></td> -<td>Private method to resort the tree.</td> -</tr> -<tr> <td><a href="#PluginRepositoryWidget.__selectedItems">__selectedItems</a></td> <td>Private method to get all selected items without the status and category items.</td> </tr> @@ -282,6 +282,10 @@ <td>Private method to check the given archive update status.</td> </tr> <tr> +<td><a href="#PluginRepositoryWidget.__updateStatusItemTexts">__updateStatusItemTexts</a></td> +<td>Private method to update the status item texts to include a number determined by a given status order.</td> +</tr> +<tr> <td><a href="#PluginRepositoryWidget.addEntry">addEntry</a></td> <td>Public method to add an entry to the list.</td> </tr> @@ -343,6 +347,57 @@ parent of this dialog </dd> </dl> +<a NAME="PluginRepositoryWidget.__addPluginItem" ID="PluginRepositoryWidget.__addPluginItem"></a> +<h4>PluginRepositoryWidget.__addPluginItem</h4> +<b>__addPluginItem</b>(<i>parentItem, name, short, description, url, author, version, filename, updateStatus, countIt=True, </i>) +<p> + Private method to add an item for the given plugin parameters. +</p> + +<dl> + +<dt><i>parentItem</i> (QTreeWidgetItem)</dt> +<dd> +reference to the parent item +</dd> +<dt><i>name</i> (str)</dt> +<dd> +data for the name field +</dd> +<dt><i>short</i> (str)</dt> +<dd> +data for the short field +</dd> +<dt><i>description</i> (list of str)</dt> +<dd> +data for the description field +</dd> +<dt><i>url</i> (str)</dt> +<dd> +data for the url field +</dd> +<dt><i>author</i> (str)</dt> +<dd> +data for the author field +</dd> +<dt><i>version</i> (str)</dt> +<dd> +data for the version field +</dd> +<dt><i>filename</i> (str)</dt> +<dd> +data for the filename field +</dd> +<dt><i>updateStatus</i> (PluginStatus)</dt> +<dd> +update status +</dd> +<dt><i>countIt</i> (bool (optional))</dt> +<dd> +flag indicating to count the item for status labels + (defaults to True) +</dd> +</dl> <a NAME="PluginRepositoryWidget.__changeScheme" ID="PluginRepositoryWidget.__changeScheme"></a> <h4>PluginRepositoryWidget.__changeScheme</h4> <b>__changeScheme</b>(<i>url, newScheme=""</i>) @@ -604,13 +659,6 @@ new reachability state </dd> </dl> -<a NAME="PluginRepositoryWidget.__resortRepositoryList" ID="PluginRepositoryWidget.__resortRepositoryList"></a> -<h4>PluginRepositoryWidget.__resortRepositoryList</h4> -<b>__resortRepositoryList</b>(<i></i>) -<p> - Private method to resort the tree. -</p> - <a NAME="PluginRepositoryWidget.__selectedItems" ID="PluginRepositoryWidget.__selectedItems"></a> <h4>PluginRepositoryWidget.__selectedItems</h4> <b>__selectedItems</b>(<i></i>) @@ -707,6 +755,14 @@ PluginStatusLocalUpdate, PluginStatusRemoteUpdate) </dd> </dl> +<a NAME="PluginRepositoryWidget.__updateStatusItemTexts" ID="PluginRepositoryWidget.__updateStatusItemTexts"></a> +<h4>PluginRepositoryWidget.__updateStatusItemTexts</h4> +<b>__updateStatusItemTexts</b>(<i></i>) +<p> + Private method to update the status item texts to include a number determined + by a given status order. +</p> + <a NAME="PluginRepositoryWidget.addEntry" ID="PluginRepositoryWidget.addEntry"></a> <h4>PluginRepositoryWidget.addEntry</h4> <b>addEntry</b>(<i>name, short, description, url, author, version, filename, status, category, </i>)
--- a/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.closehead.html Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.CloseheadExtension.closehead.html Tue Jan 14 17:29:56 2025 +0100 @@ -20,7 +20,7 @@ <table> <tr> <td><a href="#Closehead">Closehead</a></td> -<td>Class implementing the strip extension interface.</td> +<td>Class implementing the closehead extension interface.</td> </tr> </table> @@ -34,7 +34,7 @@ <a NAME="Closehead" ID="Closehead"></a> <h2>Closehead</h2> <p> - Class implementing the strip extension interface. + Class implementing the closehead extension interface. </p> <h3>Derived from</h3> @@ -94,9 +94,9 @@ <dl> -<dt><i>revisions</i> (str)</dt> +<dt><i>revisions</i> (list of str)</dt> <dd> -revisions of branch heads to be closed +list of revisions of branch heads to be closed </dd> </dl> <div align="right"><a href="#top">Up</a></div>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.HgFastexportConfigDialog.html Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,123 @@ +<!DOCTYPE html> +<html><head> +<title>eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.HgFastexportConfigDialog</title> +<meta charset="UTF-8"> +<link rel="stylesheet" href="styles.css"> +</head> +<body> +<a NAME="top" ID="top"></a> +<h1>eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.HgFastexportConfigDialog</h1> +<p> +Module implementing the fastexport configuration dialog. +</p> + +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Classes</h3> +<table> +<tr> +<td><a href="#HgFastexportConfigDialog">HgFastexportConfigDialog</a></td> +<td>Class implementing the fastexport configuration dialog.</td> +</tr> +</table> + +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> + +<hr /> +<hr /> +<a NAME="HgFastexportConfigDialog" ID="HgFastexportConfigDialog"></a> +<h2>HgFastexportConfigDialog</h2> +<p> + Class implementing the fastexport configuration dialog. +</p> + +<h3>Derived from</h3> +QDialog, Ui_HgFastexportConfigDialog +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Methods</h3> +<table> +<tr> +<td><a href="#HgFastexportConfigDialog.__init__">HgFastexportConfigDialog</a></td> +<td>Constructor</td> +</tr> +<tr> +<td><a href="#HgFastexportConfigDialog.__updateOK">__updateOK</a></td> +<td>Private slot to updated the enabled state of the OK button.</td> +</tr> +<tr> +<td><a href="#HgFastexportConfigDialog.getData">getData</a></td> +<td>Public method to get the entered fastexport configuration data.</td> +</tr> +</table> + +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> + + +<a NAME="HgFastexportConfigDialog.__init__" ID="HgFastexportConfigDialog.__init__"></a> +<h4>HgFastexportConfigDialog (Constructor)</h4> +<b>HgFastexportConfigDialog</b>(<i>revisions=None, parent=None</i>) +<p> + Constructor +</p> + +<dl> + +<dt><i>revisions</i> (list of str (optional))</dt> +<dd> +list of revisions, tags or branches to be exported + (defaults to None) +</dd> +<dt><i>parent</i> (QWidget (optional))</dt> +<dd> +reference to the parent widget (defaults to None) +</dd> +</dl> +<a NAME="HgFastexportConfigDialog.__updateOK" ID="HgFastexportConfigDialog.__updateOK"></a> +<h4>HgFastexportConfigDialog.__updateOK</h4> +<b>__updateOK</b>(<i></i>) +<p> + Private slot to updated the enabled state of the OK button. +</p> + +<a NAME="HgFastexportConfigDialog.getData" ID="HgFastexportConfigDialog.getData"></a> +<h4>HgFastexportConfigDialog.getData</h4> +<b>getData</b>(<i></i>) +<p> + Public method to get the entered fastexport configuration data. +</p> + +<dl> +<dt>Return:</dt> +<dd> +tuple containing the fastexport configuration (output file, + list of revisions, author map file, import marks file, export marks + file) +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +tuple of (str, list of str, str, str, str) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.ProjectHelper.html Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,150 @@ +<!DOCTYPE html> +<html><head> +<title>eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.ProjectHelper</title> +<meta charset="UTF-8"> +<link rel="stylesheet" href="styles.css"> +</head> +<body> +<a NAME="top" ID="top"></a> +<h1>eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.ProjectHelper</h1> +<p> +Module implementing the fastexport extension project helper. +</p> + +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Classes</h3> +<table> +<tr> +<td><a href="#FastexportProjectHelper">FastexportProjectHelper</a></td> +<td>Class implementing the fastexport extension project helper.</td> +</tr> +</table> + +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> + +<hr /> +<hr /> +<a NAME="FastexportProjectHelper" ID="FastexportProjectHelper"></a> +<h2>FastexportProjectHelper</h2> +<p> + Class implementing the fastexport extension project helper. +</p> + +<h3>Derived from</h3> +HgExtensionProjectHelper +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Methods</h3> +<table> +<tr> +<td><a href="#FastexportProjectHelper.__init__">FastexportProjectHelper</a></td> +<td>Constructor</td> +</tr> +<tr> +<td><a href="#FastexportProjectHelper.__hgFastexport">__hgFastexport</a></td> +<td>Private slot used to generate a git fast-import file.</td> +</tr> +<tr> +<td><a href="#FastexportProjectHelper.initActions">initActions</a></td> +<td>Public method to generate the action objects.</td> +</tr> +<tr> +<td><a href="#FastexportProjectHelper.initMenu">initMenu</a></td> +<td>Public method to generate the extension menu.</td> +</tr> +<tr> +<td><a href="#FastexportProjectHelper.menuTitle">menuTitle</a></td> +<td>Public method to get the menu title.</td> +</tr> +</table> + +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> + + +<a NAME="FastexportProjectHelper.__init__" ID="FastexportProjectHelper.__init__"></a> +<h4>FastexportProjectHelper (Constructor)</h4> +<b>FastexportProjectHelper</b>(<i></i>) +<p> + Constructor +</p> + +<a NAME="FastexportProjectHelper.__hgFastexport" ID="FastexportProjectHelper.__hgFastexport"></a> +<h4>FastexportProjectHelper.__hgFastexport</h4> +<b>__hgFastexport</b>(<i></i>) +<p> + Private slot used to generate a git fast-import file. +</p> + +<a NAME="FastexportProjectHelper.initActions" ID="FastexportProjectHelper.initActions"></a> +<h4>FastexportProjectHelper.initActions</h4> +<b>initActions</b>(<i></i>) +<p> + Public method to generate the action objects. +</p> + +<a NAME="FastexportProjectHelper.initMenu" ID="FastexportProjectHelper.initMenu"></a> +<h4>FastexportProjectHelper.initMenu</h4> +<b>initMenu</b>(<i>mainMenu</i>) +<p> + Public method to generate the extension menu. +</p> + +<dl> + +<dt><i>mainMenu</i> (QMenu)</dt> +<dd> +reference to the main menu +</dd> +</dl> +<dl> +<dt>Return:</dt> +<dd> +populated menu +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +QMenu +</dd> +</dl> +<a NAME="FastexportProjectHelper.menuTitle" ID="FastexportProjectHelper.menuTitle"></a> +<h4>FastexportProjectHelper.menuTitle</h4> +<b>menuTitle</b>(<i></i>) +<p> + Public method to get the menu title. +</p> + +<dl> +<dt>Return:</dt> +<dd> +title of the menu +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.fastexport.html Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,137 @@ +<!DOCTYPE html> +<html><head> +<title>eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.fastexport</title> +<meta charset="UTF-8"> +<link rel="stylesheet" href="styles.css"> +</head> +<body> +<a NAME="top" ID="top"></a> +<h1>eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.fastexport</h1> +<p> +Module implementing the fastexport extension interface. +</p> + +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Classes</h3> +<table> +<tr> +<td><a href="#Fastexport">Fastexport</a></td> +<td>Class implementing the fastexport extension interface.</td> +</tr> +</table> + +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> + +<hr /> +<hr /> +<a NAME="Fastexport" ID="Fastexport"></a> +<h2>Fastexport</h2> +<p> + Class implementing the fastexport extension interface. +</p> + +<h3>Derived from</h3> +HgExtension +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Methods</h3> +<table> +<tr> +<td><a href="#Fastexport.__init__">Fastexport</a></td> +<td>Constructor</td> +</tr> +<tr> +<td><a href="#Fastexport.__processFinished">__processFinished</a></td> +<td>Private slot to handle the process finished signal.</td> +</tr> +<tr> +<td><a href="#Fastexport.__readStderr">__readStderr</a></td> +<td>Private slot to handle the readyReadStandardError signal.</td> +</tr> +<tr> +<td><a href="#Fastexport.hgFastexport">hgFastexport</a></td> +<td>Public method to export the repository as a git fast-import stream.</td> +</tr> +</table> + +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> + + +<a NAME="Fastexport.__init__" ID="Fastexport.__init__"></a> +<h4>Fastexport (Constructor)</h4> +<b>Fastexport</b>(<i>vcs, ui=None</i>) +<p> + Constructor +</p> + +<dl> + +<dt><i>vcs</i> (Hg)</dt> +<dd> +reference to the Mercurial vcs object +</dd> +<dt><i>ui</i> (QWidget)</dt> +<dd> +reference to a UI widget (defaults to None) +</dd> +</dl> +<a NAME="Fastexport.__processFinished" ID="Fastexport.__processFinished"></a> +<h4>Fastexport.__processFinished</h4> +<b>__processFinished</b>(<i>exitCode, exitStatus</i>) +<p> + Private slot to handle the process finished signal. +</p> + +<dl> + +<dt><i>exitCode</i> (int)</dt> +<dd> +exit code of the process +</dd> +<dt><i>exitStatus</i> (QProcess.ExitStatus)</dt> +<dd> +exit status +</dd> +</dl> +<a NAME="Fastexport.__readStderr" ID="Fastexport.__readStderr"></a> +<h4>Fastexport.__readStderr</h4> +<b>__readStderr</b>(<i></i>) +<p> + Private slot to handle the readyReadStandardError signal. +</p> + +<a NAME="Fastexport.hgFastexport" ID="Fastexport.hgFastexport"></a> +<h4>Fastexport.hgFastexport</h4> +<b>hgFastexport</b>(<i>revisions=None</i>) +<p> + Public method to export the repository as a git fast-import stream. +</p> + +<dl> + +<dt><i>revisions</i> (list of str)</dt> +<dd> +list of revisions to be exported +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html>
--- a/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.HgDialog.html Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.HgDialog.html Tue Jan 14 17:29:56 2025 +0100 @@ -70,7 +70,7 @@ </tr> <tr> <td><a href="#HgDialog.__showError">__showError</a></td> -<td>Private slot to show some error.</td> +<td>Private slot to show some error or progress information.</td> </tr> <tr> <td><a href="#HgDialog.__showOutput">__showOutput</a></td> @@ -169,14 +169,14 @@ <h4>HgDialog.__showError</h4> <b>__showError</b>(<i>out</i>) <p> - Private slot to show some error. + Private slot to show some error or progress information. </p> <dl> <dt><i>out</i> (str)</dt> <dd> -error to be shown +output sent to the stderr channel </dd> </dl> <a NAME="HgDialog.__showOutput" ID="HgDialog.__showOutput"></a> @@ -190,7 +190,7 @@ <dt><i>out</i> (str)</dt> <dd> -output to be shown +output sent to the stdout channel </dd> </dl> <a NAME="HgDialog.hasAddOrDelete" ID="HgDialog.hasAddOrDelete"></a>
--- a/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectBrowserHelper.html Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.HgExtensionProjectBrowserHelper.html Tue Jan 14 17:29:56 2025 +0100 @@ -74,7 +74,7 @@ <td>Public method to get the menu title.</td> </tr> <tr> -<td><a href="#HgExtensionProjectBrowserHelper.showExtensionMenu">showExtensionMenu</a></td> +<td><a href="#HgExtensionProjectBrowserHelper.showMenu">showMenu</a></td> <td>Public method to prepare the extension menu for display.</td> </tr> </table> @@ -182,9 +182,9 @@ reimplemented </dd> </dl> -<a NAME="HgExtensionProjectBrowserHelper.showExtensionMenu" ID="HgExtensionProjectBrowserHelper.showExtensionMenu"></a> -<h4>HgExtensionProjectBrowserHelper.showExtensionMenu</h4> -<b>showExtensionMenu</b>(<i>key, controlled</i>) +<a NAME="HgExtensionProjectBrowserHelper.showMenu" ID="HgExtensionProjectBrowserHelper.showMenu"></a> +<h4>HgExtensionProjectBrowserHelper.showMenu</h4> +<b>showMenu</b>(<i>key, controlled</i>) <p> Public method to prepare the extension menu for display. </p>
--- a/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html Tue Jan 14 17:29:56 2025 +0100 @@ -209,7 +209,7 @@ </tr> <tr> <td><a href="#HgLogBrowserDialog.__pullActTriggered">__pullActTriggered</a></td> -<td>Private slot to pull changes from a remote repository.</td> +<td>Private slot to pull all or selected changes from a remote repository.</td> </tr> <tr> <td><a href="#HgLogBrowserDialog.__pushActTriggered">__pushActTriggered</a></td> @@ -980,11 +980,19 @@ <a NAME="HgLogBrowserDialog.__pullActTriggered" ID="HgLogBrowserDialog.__pullActTriggered"></a> <h4>HgLogBrowserDialog.__pullActTriggered</h4> -<b>__pullActTriggered</b>(<i></i>) +<b>__pullActTriggered</b>(<i>selectedOnly=False</i>) <p> - Private slot to pull changes from a remote repository. + Private slot to pull all or selected changes from a remote repository. </p> +<dl> + +<dt><i>selectedOnly</i> (bool (optional))</dt> +<dd> +flag indicating to pull the selected changes only + (defaults to False) +</dd> +</dl> <a NAME="HgLogBrowserDialog.__pushActTriggered" ID="HgLogBrowserDialog.__pushActTriggered"></a> <h4>HgLogBrowserDialog.__pushActTriggered</h4> <b>__pushActTriggered</b>(<i></i>)
--- a/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.HgUtilities.html Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.HgUtilities.html Tue Jan 14 17:29:56 2025 +0100 @@ -13,7 +13,8 @@ <h3>Global Attributes</h3> <table> -<tr><td>None</td></tr> +<tr><td>progressRe</td></tr> +<tr><td>versionRe</td></tr> </table> <h3>Classes</h3> @@ -36,6 +37,14 @@ <td>Public method to determine the Mercurial version.</td> </tr> <tr> +<td><a href="#isProgressInfo">isProgressInfo</a></td> +<td>Function to check, if the given line contains progress information.</td> +</tr> +<tr> +<td><a href="#parseProgressInfo">parseProgressInfo</a></td> +<td>Function to parse an output line containing progress information.</td> +</tr> +<tr> <td><a href="#prepareProcess">prepareProcess</a></td> <td>Function to prepare the given process.</td> </tr> @@ -117,6 +126,65 @@ <div align="right"><a href="#top">Up</a></div> <hr /> <hr /> +<a NAME="isProgressInfo" ID="isProgressInfo"></a> +<h2>isProgressInfo</h2> +<b>isProgressInfo</b>(<i>line</i>) +<p> + Function to check, if the given line contains progress information. +</p> + +<dl> + +<dt><i>line</i> (str)</dt> +<dd> +output line to be checked +</dd> +</dl> +<dl> +<dt>Return:</dt> +<dd> +flag indicating a line containing progress information +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +<hr /> +<a NAME="parseProgressInfo" ID="parseProgressInfo"></a> +<h2>parseProgressInfo</h2> +<b>parseProgressInfo</b>(<i>progressLine</i>) +<p> + Function to parse an output line containing progress information. +</p> + +<dl> + +<dt><i>progressLine</i> (str)</dt> +<dd> +progress information line to be parsed +</dd> +</dl> +<dl> +<dt>Return:</dt> +<dd> +tuple containing the progress topic, current value, maximum value and + the completion estimate +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +tuple of (str, int, int, str) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +<hr /> <a NAME="prepareProcess" ID="prepareProcess"></a> <h2>prepareProcess</h2> <b>prepareProcess</b>(<i>proc, encoding="", language=""</i>)
--- a/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.ProjectBrowserHelper.html Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.ProjectBrowserHelper.html Tue Jan 14 17:29:56 2025 +0100 @@ -68,7 +68,7 @@ <td>Public method to get the menu title.</td> </tr> <tr> -<td><a href="#LargefilesProjectBrowserHelper.showExtensionMenu">showExtensionMenu</a></td> +<td><a href="#LargefilesProjectBrowserHelper.showMenu">showMenu</a></td> <td>Public method to prepare the extension menu for display.</td> </tr> </table> @@ -160,9 +160,9 @@ str </dd> </dl> -<a NAME="LargefilesProjectBrowserHelper.showExtensionMenu" ID="LargefilesProjectBrowserHelper.showExtensionMenu"></a> -<h4>LargefilesProjectBrowserHelper.showExtensionMenu</h4> -<b>showExtensionMenu</b>(<i>key, controlled</i>) +<a NAME="LargefilesProjectBrowserHelper.showMenu" ID="LargefilesProjectBrowserHelper.showMenu"></a> +<h4>LargefilesProjectBrowserHelper.showMenu</h4> +<b>showMenu</b>(<i>key, controlled</i>) <p> Public method to prepare the extension menu for display. </p>
--- a/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.ProjectHelper.html Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.ProjectHelper.html Tue Jan 14 17:29:56 2025 +0100 @@ -8,7 +8,7 @@ <a NAME="top" ID="top"></a> <h1>eric7.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.ProjectHelper</h1> <p> -Module implementing the shelve extension project helper. +Module implementing the largefiles extension project helper. </p> <h3>Global Attributes</h3> @@ -20,7 +20,7 @@ <table> <tr> <td><a href="#LargefilesProjectHelper">LargefilesProjectHelper</a></td> -<td>Class implementing the queues extension project helper.</td> +<td>Class implementing the largefiles extension project helper.</td> </tr> </table> @@ -34,7 +34,7 @@ <a NAME="LargefilesProjectHelper" ID="LargefilesProjectHelper"></a> <h2>LargefilesProjectHelper</h2> <p> - Class implementing the queues extension project helper. + Class implementing the largefiles extension project helper. </p> <h3>Derived from</h3>
--- a/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html Tue Jan 14 17:29:56 2025 +0100 @@ -112,10 +112,18 @@ <td>Private slot called by the context menu to mark conflicts of a file as being unresolved.</td> </tr> <tr> +<td><a href="#HgProjectBrowserHelper.__addBuiltinsMenu">__addBuiltinsMenu</a></td> +<td>Private method to add a 'Other Functions' menu entry.</td> +</tr> +<tr> <td><a href="#HgProjectBrowserHelper.__addExtensionsMenu">__addExtensionsMenu</a></td> <td>Private method to add an extension menu entry.</td> </tr> <tr> +<td><a href="#HgProjectBrowserHelper.__showBuiltinsMenu">__showBuiltinsMenu</a></td> +<td>Private slot showing the 'Other Functions' menu.</td> +</tr> +<tr> <td><a href="#HgProjectBrowserHelper.__showExtensionMenu">__showExtensionMenu</a></td> <td>Private slot showing the extensions menu.</td> </tr> @@ -314,6 +322,37 @@ as being unresolved. </p> +<a NAME="HgProjectBrowserHelper.__addBuiltinsMenu" ID="HgProjectBrowserHelper.__addBuiltinsMenu"></a> +<h4>HgProjectBrowserHelper.__addBuiltinsMenu</h4> +<b>__addBuiltinsMenu</b>(<i>menu, key</i>) +<p> + Private method to add a 'Other Functions' menu entry. +</p> + +<dl> + +<dt><i>menu</i> (QMenu)</dt> +<dd> +menu to add it to +</dd> +<dt><i>key</i> (str)</dt> +<dd> +menu key (one of 'mainMenu', 'multiMenu', 'backMenu', 'dirMenu' + or 'dirMultiMenu') +</dd> +</dl> +<dl> +<dt>Return:</dt> +<dd> +reference to the menu action +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +QAction +</dd> +</dl> <a NAME="HgProjectBrowserHelper.__addExtensionsMenu" ID="HgProjectBrowserHelper.__addExtensionsMenu"></a> <h4>HgProjectBrowserHelper.__addExtensionsMenu</h4> <b>__addExtensionsMenu</b>(<i>menu, key</i>) @@ -345,6 +384,26 @@ QAction </dd> </dl> +<a NAME="HgProjectBrowserHelper.__showBuiltinsMenu" ID="HgProjectBrowserHelper.__showBuiltinsMenu"></a> +<h4>HgProjectBrowserHelper.__showBuiltinsMenu</h4> +<b>__showBuiltinsMenu</b>(<i>key, controlled</i>) +<p> + Private slot showing the 'Other Functions' menu. +</p> + +<dl> + +<dt><i>key</i> (str)</dt> +<dd> +menu key (one of 'mainMenu', 'multiMenu', 'backMenu', 'dirMenu' + or 'dirMultiMenu') +</dd> +<dt><i>controlled</i> (bool)</dt> +<dd> +flag indicating to show the menu for a + version controlled entry or a non-version controlled entry +</dd> +</dl> <a NAME="HgProjectBrowserHelper.__showExtensionMenu" ID="HgProjectBrowserHelper.__showExtensionMenu"></a> <h4>HgProjectBrowserHelper.__showExtensionMenu</h4> <b>__showExtensionMenu</b>(<i>key, controlled</i>)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.HgPurgeListDialog.html Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,86 @@ +<!DOCTYPE html> +<html><head> +<title>eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.HgPurgeListDialog</title> +<meta charset="UTF-8"> +<link rel="stylesheet" href="styles.css"> +</head> +<body> +<a NAME="top" ID="top"></a> +<h1>eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.HgPurgeListDialog</h1> +<p> +Module implementing a dialog to list all files not tracked by Mercurial. +</p> + +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Classes</h3> +<table> +<tr> +<td><a href="#HgPurgeListDialog">HgPurgeListDialog</a></td> +<td>Class implementing a dialog to list all files not tracked by Mercurial.</td> +</tr> +</table> + +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> + +<hr /> +<hr /> +<a NAME="HgPurgeListDialog" ID="HgPurgeListDialog"></a> +<h2>HgPurgeListDialog</h2> +<p> + Class implementing a dialog to list all files not tracked by Mercurial. +</p> + +<h3>Derived from</h3> +QDialog, Ui_HgPurgeListDialog +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Methods</h3> +<table> +<tr> +<td><a href="#HgPurgeListDialog.__init__">HgPurgeListDialog</a></td> +<td>Constructor</td> +</tr> +</table> + +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> + + +<a NAME="HgPurgeListDialog.__init__" ID="HgPurgeListDialog.__init__"></a> +<h4>HgPurgeListDialog (Constructor)</h4> +<b>HgPurgeListDialog</b>(<i>entries, parent=None</i>) +<p> + Constructor +</p> + +<dl> + +<dt><i>entries</i> (list of str)</dt> +<dd> +list of entries to be shown +</dd> +<dt><i>parent</i> (QWidget)</dt> +<dd> +reference to the parent widget +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.ProjectHelper.html Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,205 @@ +<!DOCTYPE html> +<html><head> +<title>eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.ProjectHelper</title> +<meta charset="UTF-8"> +<link rel="stylesheet" href="styles.css"> +</head> +<body> +<a NAME="top" ID="top"></a> +<h1>eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.ProjectHelper</h1> +<p> +Module implementing the purge extension project helper. +</p> + +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Classes</h3> +<table> +<tr> +<td><a href="#PurgeProjectHelper">PurgeProjectHelper</a></td> +<td>Class implementing the purge extension project helper.</td> +</tr> +</table> + +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> + +<hr /> +<hr /> +<a NAME="PurgeProjectHelper" ID="PurgeProjectHelper"></a> +<h2>PurgeProjectHelper</h2> +<p> + Class implementing the purge extension project helper. +</p> + +<h3>Derived from</h3> +HgExtensionProjectHelper +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Methods</h3> +<table> +<tr> +<td><a href="#PurgeProjectHelper.__init__">PurgeProjectHelper</a></td> +<td>Constructor</td> +</tr> +<tr> +<td><a href="#PurgeProjectHelper.__hgPurge">__hgPurge</a></td> +<td>Private slot used to remove not version controlled files.</td> +</tr> +<tr> +<td><a href="#PurgeProjectHelper.__hgPurgeAll">__hgPurgeAll</a></td> +<td>Private slot used to remove not version controlled files including ignored ones.</td> +</tr> +<tr> +<td><a href="#PurgeProjectHelper.__hgPurgeAllList">__hgPurgeAllList</a></td> +<td>Private slot used to list not version controlled files including ignored ones.</td> +</tr> +<tr> +<td><a href="#PurgeProjectHelper.__hgPurgeIgnored">__hgPurgeIgnored</a></td> +<td>Private slot used to remove ignored files.</td> +</tr> +<tr> +<td><a href="#PurgeProjectHelper.__hgPurgeIgnoredList">__hgPurgeIgnoredList</a></td> +<td>Private slot used to list ignored files.</td> +</tr> +<tr> +<td><a href="#PurgeProjectHelper.__hgPurgeList">__hgPurgeList</a></td> +<td>Private slot used to list not version controlled files.</td> +</tr> +<tr> +<td><a href="#PurgeProjectHelper.initActions">initActions</a></td> +<td>Public method to generate the action objects.</td> +</tr> +<tr> +<td><a href="#PurgeProjectHelper.initMenu">initMenu</a></td> +<td>Public method to generate the extension menu.</td> +</tr> +<tr> +<td><a href="#PurgeProjectHelper.menuTitle">menuTitle</a></td> +<td>Public method to get the menu title.</td> +</tr> +</table> + +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> + + +<a NAME="PurgeProjectHelper.__init__" ID="PurgeProjectHelper.__init__"></a> +<h4>PurgeProjectHelper (Constructor)</h4> +<b>PurgeProjectHelper</b>(<i></i>) +<p> + Constructor +</p> + +<a NAME="PurgeProjectHelper.__hgPurge" ID="PurgeProjectHelper.__hgPurge"></a> +<h4>PurgeProjectHelper.__hgPurge</h4> +<b>__hgPurge</b>(<i></i>) +<p> + Private slot used to remove not version controlled files. +</p> + +<a NAME="PurgeProjectHelper.__hgPurgeAll" ID="PurgeProjectHelper.__hgPurgeAll"></a> +<h4>PurgeProjectHelper.__hgPurgeAll</h4> +<b>__hgPurgeAll</b>(<i></i>) +<p> + Private slot used to remove not version controlled files including ignored ones. +</p> + +<a NAME="PurgeProjectHelper.__hgPurgeAllList" ID="PurgeProjectHelper.__hgPurgeAllList"></a> +<h4>PurgeProjectHelper.__hgPurgeAllList</h4> +<b>__hgPurgeAllList</b>(<i></i>) +<p> + Private slot used to list not version controlled files including ignored ones. +</p> + +<a NAME="PurgeProjectHelper.__hgPurgeIgnored" ID="PurgeProjectHelper.__hgPurgeIgnored"></a> +<h4>PurgeProjectHelper.__hgPurgeIgnored</h4> +<b>__hgPurgeIgnored</b>(<i></i>) +<p> + Private slot used to remove ignored files. +</p> + +<a NAME="PurgeProjectHelper.__hgPurgeIgnoredList" ID="PurgeProjectHelper.__hgPurgeIgnoredList"></a> +<h4>PurgeProjectHelper.__hgPurgeIgnoredList</h4> +<b>__hgPurgeIgnoredList</b>(<i></i>) +<p> + Private slot used to list ignored files. +</p> + +<a NAME="PurgeProjectHelper.__hgPurgeList" ID="PurgeProjectHelper.__hgPurgeList"></a> +<h4>PurgeProjectHelper.__hgPurgeList</h4> +<b>__hgPurgeList</b>(<i></i>) +<p> + Private slot used to list not version controlled files. +</p> + +<a NAME="PurgeProjectHelper.initActions" ID="PurgeProjectHelper.initActions"></a> +<h4>PurgeProjectHelper.initActions</h4> +<b>initActions</b>(<i></i>) +<p> + Public method to generate the action objects. +</p> + +<a NAME="PurgeProjectHelper.initMenu" ID="PurgeProjectHelper.initMenu"></a> +<h4>PurgeProjectHelper.initMenu</h4> +<b>initMenu</b>(<i>mainMenu</i>) +<p> + Public method to generate the extension menu. +</p> + +<dl> + +<dt><i>mainMenu</i> (QMenu)</dt> +<dd> +reference to the main menu +</dd> +</dl> +<dl> +<dt>Return:</dt> +<dd> +populated menu +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +QMenu +</dd> +</dl> +<a NAME="PurgeProjectHelper.menuTitle" ID="PurgeProjectHelper.menuTitle"></a> +<h4>PurgeProjectHelper.menuTitle</h4> +<b>menuTitle</b>(<i></i>) +<p> + Public method to get the menu title. +</p> + +<dl> +<dt>Return:</dt> +<dd> +title of the menu +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.purge.html Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,180 @@ +<!DOCTYPE html> +<html><head> +<title>eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.purge</title> +<meta charset="UTF-8"> +<link rel="stylesheet" href="styles.css"> +</head> +<body> +<a NAME="top" ID="top"></a> +<h1>eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.purge</h1> +<p> +Module implementing the purge extension interface. +</p> + +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Classes</h3> +<table> +<tr> +<td><a href="#Purge">Purge</a></td> +<td>Class implementing the purge extension interface.</td> +</tr> +</table> + +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> + +<hr /> +<hr /> +<a NAME="Purge" ID="Purge"></a> +<h2>Purge</h2> +<p> + Class implementing the purge extension interface. +</p> + +<h3>Derived from</h3> +HgExtension +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Methods</h3> +<table> +<tr> +<td><a href="#Purge.__init__">Purge</a></td> +<td>Constructor</td> +</tr> +<tr> +<td><a href="#Purge.__getEntries">__getEntries</a></td> +<td>Private method to get a list of files/directories about to be purged.</td> +</tr> +<tr> +<td><a href="#Purge.hgPurge">hgPurge</a></td> +<td>Public method to purge files and directories not tracked by Mercurial.</td> +</tr> +<tr> +<td><a href="#Purge.hgPurgeList">hgPurgeList</a></td> +<td>Public method to list files and directories not tracked by Mercurial.</td> +</tr> +<tr> +<td><a href="#Purge.shutdown">shutdown</a></td> +<td>Public method used to shutdown the purge interface.</td> +</tr> +</table> + +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> + + +<a NAME="Purge.__init__" ID="Purge.__init__"></a> +<h4>Purge (Constructor)</h4> +<b>Purge</b>(<i>vcs, ui=None</i>) +<p> + Constructor +</p> + +<dl> + +<dt><i>vcs</i> (Hg)</dt> +<dd> +reference to the Mercurial vcs object +</dd> +<dt><i>ui</i> (QWidget)</dt> +<dd> +reference to a UI widget (defaults to None) +</dd> +</dl> +<a NAME="Purge.__getEntries" ID="Purge.__getEntries"></a> +<h4>Purge.__getEntries</h4> +<b>__getEntries</b>(<i>deleteAll, ignoredOnly</i>) +<p> + Private method to get a list of files/directories about to be purged. +</p> + +<dl> + +<dt><i>deleteAll</i> (bool)</dt> +<dd> +flag indicating to delete all files including ignored + ones +</dd> +<dt><i>ignoredOnly</i> (bool)</dt> +<dd> +flag indicating to delete ignored files only +</dd> +</dl> +<dl> +<dt>Return:</dt> +<dd> +name of the current patch +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl> +<a NAME="Purge.hgPurge" ID="Purge.hgPurge"></a> +<h4>Purge.hgPurge</h4> +<b>hgPurge</b>(<i>deleteAll=False, ignoredOnly=False</i>) +<p> + Public method to purge files and directories not tracked by Mercurial. +</p> + +<dl> + +<dt><i>deleteAll</i> (bool (optional))</dt> +<dd> +flag indicating to delete all files including ignored + ones (defaults to False) +</dd> +<dt><i>ignoredOnly</i> (bool (optional))</dt> +<dd> +flag indicating to delete ignored files only (defaults + to False) +</dd> +</dl> +<a NAME="Purge.hgPurgeList" ID="Purge.hgPurgeList"></a> +<h4>Purge.hgPurgeList</h4> +<b>hgPurgeList</b>(<i>deleteAll=False, ignoredOnly=False</i>) +<p> + Public method to list files and directories not tracked by Mercurial. +</p> + +<dl> + +<dt><i>deleteAll</i> (bool (optional))</dt> +<dd> +flag indicating to delete all files including ignored + ones (defaults to False) +</dd> +<dt><i>ignoredOnly</i> (bool (optional))</dt> +<dd> +flag indicating to delete ignored files only (defaults + to False) +</dd> +</dl> +<a NAME="Purge.shutdown" ID="Purge.shutdown"></a> +<h4>Purge.shutdown</h4> +<b>shutdown</b>(<i></i>) +<p> + Public method used to shutdown the purge interface. +</p> + +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html>
--- a/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.HgPurgeListDialog.html Sat Nov 30 11:09:02 2024 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,86 +0,0 @@ -<!DOCTYPE html> -<html><head> -<title>eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.HgPurgeListDialog</title> -<meta charset="UTF-8"> -<link rel="stylesheet" href="styles.css"> -</head> -<body> -<a NAME="top" ID="top"></a> -<h1>eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.HgPurgeListDialog</h1> -<p> -Module implementing a dialog to list all files not tracked by Mercurial. -</p> - -<h3>Global Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> - -<h3>Classes</h3> -<table> -<tr> -<td><a href="#HgPurgeListDialog">HgPurgeListDialog</a></td> -<td>Class implementing a dialog to list all files not tracked by Mercurial.</td> -</tr> -</table> - -<h3>Functions</h3> -<table> -<tr><td>None</td></tr> -</table> - -<hr /> -<hr /> -<a NAME="HgPurgeListDialog" ID="HgPurgeListDialog"></a> -<h2>HgPurgeListDialog</h2> -<p> - Class implementing a dialog to list all files not tracked by Mercurial. -</p> - -<h3>Derived from</h3> -QDialog, Ui_HgPurgeListDialog -<h3>Class Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> - -<h3>Class Methods</h3> -<table> -<tr><td>None</td></tr> -</table> - -<h3>Methods</h3> -<table> -<tr> -<td><a href="#HgPurgeListDialog.__init__">HgPurgeListDialog</a></td> -<td>Constructor</td> -</tr> -</table> - -<h3>Static Methods</h3> -<table> -<tr><td>None</td></tr> -</table> - - -<a NAME="HgPurgeListDialog.__init__" ID="HgPurgeListDialog.__init__"></a> -<h4>HgPurgeListDialog (Constructor)</h4> -<b>HgPurgeListDialog</b>(<i>entries, parent=None</i>) -<p> - Constructor -</p> - -<dl> - -<dt><i>entries</i> (list of str)</dt> -<dd> -list of entries to be shown -</dd> -<dt><i>parent</i> (QWidget)</dt> -<dd> -reference to the parent widget -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /> -</body></html>
--- a/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.ProjectHelper.html Sat Nov 30 11:09:02 2024 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,183 +0,0 @@ -<!DOCTYPE html> -<html><head> -<title>eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.ProjectHelper</title> -<meta charset="UTF-8"> -<link rel="stylesheet" href="styles.css"> -</head> -<body> -<a NAME="top" ID="top"></a> -<h1>eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.ProjectHelper</h1> -<p> -Module implementing the purge extension project helper. -</p> - -<h3>Global Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> - -<h3>Classes</h3> -<table> -<tr> -<td><a href="#PurgeProjectHelper">PurgeProjectHelper</a></td> -<td>Class implementing the purge extension project helper.</td> -</tr> -</table> - -<h3>Functions</h3> -<table> -<tr><td>None</td></tr> -</table> - -<hr /> -<hr /> -<a NAME="PurgeProjectHelper" ID="PurgeProjectHelper"></a> -<h2>PurgeProjectHelper</h2> -<p> - Class implementing the purge extension project helper. -</p> - -<h3>Derived from</h3> -HgExtensionProjectHelper -<h3>Class Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> - -<h3>Class Methods</h3> -<table> -<tr><td>None</td></tr> -</table> - -<h3>Methods</h3> -<table> -<tr> -<td><a href="#PurgeProjectHelper.__init__">PurgeProjectHelper</a></td> -<td>Constructor</td> -</tr> -<tr> -<td><a href="#PurgeProjectHelper.__hgPurge">__hgPurge</a></td> -<td>Private slot used to remove files not tracked by Mercurial.</td> -</tr> -<tr> -<td><a href="#PurgeProjectHelper.__hgPurgeAll">__hgPurgeAll</a></td> -<td>Private slot used to remove all files not tracked by Mercurial.</td> -</tr> -<tr> -<td><a href="#PurgeProjectHelper.__hgPurgeAllList">__hgPurgeAllList</a></td> -<td>Private slot used to list all files not tracked by Mercurial.</td> -</tr> -<tr> -<td><a href="#PurgeProjectHelper.__hgPurgeList">__hgPurgeList</a></td> -<td>Private slot used to list files not tracked by Mercurial.</td> -</tr> -<tr> -<td><a href="#PurgeProjectHelper.initActions">initActions</a></td> -<td>Public method to generate the action objects.</td> -</tr> -<tr> -<td><a href="#PurgeProjectHelper.initMenu">initMenu</a></td> -<td>Public method to generate the extension menu.</td> -</tr> -<tr> -<td><a href="#PurgeProjectHelper.menuTitle">menuTitle</a></td> -<td>Public method to get the menu title.</td> -</tr> -</table> - -<h3>Static Methods</h3> -<table> -<tr><td>None</td></tr> -</table> - - -<a NAME="PurgeProjectHelper.__init__" ID="PurgeProjectHelper.__init__"></a> -<h4>PurgeProjectHelper (Constructor)</h4> -<b>PurgeProjectHelper</b>(<i></i>) -<p> - Constructor -</p> - -<a NAME="PurgeProjectHelper.__hgPurge" ID="PurgeProjectHelper.__hgPurge"></a> -<h4>PurgeProjectHelper.__hgPurge</h4> -<b>__hgPurge</b>(<i></i>) -<p> - Private slot used to remove files not tracked by Mercurial. -</p> - -<a NAME="PurgeProjectHelper.__hgPurgeAll" ID="PurgeProjectHelper.__hgPurgeAll"></a> -<h4>PurgeProjectHelper.__hgPurgeAll</h4> -<b>__hgPurgeAll</b>(<i></i>) -<p> - Private slot used to remove all files not tracked by Mercurial. -</p> - -<a NAME="PurgeProjectHelper.__hgPurgeAllList" ID="PurgeProjectHelper.__hgPurgeAllList"></a> -<h4>PurgeProjectHelper.__hgPurgeAllList</h4> -<b>__hgPurgeAllList</b>(<i></i>) -<p> - Private slot used to list all files not tracked by Mercurial. -</p> - -<a NAME="PurgeProjectHelper.__hgPurgeList" ID="PurgeProjectHelper.__hgPurgeList"></a> -<h4>PurgeProjectHelper.__hgPurgeList</h4> -<b>__hgPurgeList</b>(<i></i>) -<p> - Private slot used to list files not tracked by Mercurial. -</p> - -<a NAME="PurgeProjectHelper.initActions" ID="PurgeProjectHelper.initActions"></a> -<h4>PurgeProjectHelper.initActions</h4> -<b>initActions</b>(<i></i>) -<p> - Public method to generate the action objects. -</p> - -<a NAME="PurgeProjectHelper.initMenu" ID="PurgeProjectHelper.initMenu"></a> -<h4>PurgeProjectHelper.initMenu</h4> -<b>initMenu</b>(<i>mainMenu</i>) -<p> - Public method to generate the extension menu. -</p> - -<dl> - -<dt><i>mainMenu</i> (QMenu)</dt> -<dd> -reference to the main menu -</dd> -</dl> -<dl> -<dt>Return:</dt> -<dd> -populated menu -</dd> -</dl> -<dl> -<dt>Return Type:</dt> -<dd> -QMenu -</dd> -</dl> -<a NAME="PurgeProjectHelper.menuTitle" ID="PurgeProjectHelper.menuTitle"></a> -<h4>PurgeProjectHelper.menuTitle</h4> -<b>menuTitle</b>(<i></i>) -<p> - Public method to get the menu title. -</p> - -<dl> -<dt>Return:</dt> -<dd> -title of the menu -</dd> -</dl> -<dl> -<dt>Return Type:</dt> -<dd> -str -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /> -</body></html>
--- a/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.purge.html Sat Nov 30 11:09:02 2024 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,166 +0,0 @@ -<!DOCTYPE html> -<html><head> -<title>eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.purge</title> -<meta charset="UTF-8"> -<link rel="stylesheet" href="styles.css"> -</head> -<body> -<a NAME="top" ID="top"></a> -<h1>eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.purge</h1> -<p> -Module implementing the purge extension interface. -</p> - -<h3>Global Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> - -<h3>Classes</h3> -<table> -<tr> -<td><a href="#Purge">Purge</a></td> -<td>Class implementing the purge extension interface.</td> -</tr> -</table> - -<h3>Functions</h3> -<table> -<tr><td>None</td></tr> -</table> - -<hr /> -<hr /> -<a NAME="Purge" ID="Purge"></a> -<h2>Purge</h2> -<p> - Class implementing the purge extension interface. -</p> - -<h3>Derived from</h3> -HgExtension -<h3>Class Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> - -<h3>Class Methods</h3> -<table> -<tr><td>None</td></tr> -</table> - -<h3>Methods</h3> -<table> -<tr> -<td><a href="#Purge.__init__">Purge</a></td> -<td>Constructor</td> -</tr> -<tr> -<td><a href="#Purge.__getEntries">__getEntries</a></td> -<td>Private method to get a list of files/directories being purged.</td> -</tr> -<tr> -<td><a href="#Purge.hgPurge">hgPurge</a></td> -<td>Public method to purge files and directories not tracked by Mercurial.</td> -</tr> -<tr> -<td><a href="#Purge.hgPurgeList">hgPurgeList</a></td> -<td>Public method to list files and directories not tracked by Mercurial.</td> -</tr> -<tr> -<td><a href="#Purge.shutdown">shutdown</a></td> -<td>Public method used to shutdown the purge interface.</td> -</tr> -</table> - -<h3>Static Methods</h3> -<table> -<tr><td>None</td></tr> -</table> - - -<a NAME="Purge.__init__" ID="Purge.__init__"></a> -<h4>Purge (Constructor)</h4> -<b>Purge</b>(<i>vcs, ui=None</i>) -<p> - Constructor -</p> - -<dl> - -<dt><i>vcs</i> (Hg)</dt> -<dd> -reference to the Mercurial vcs object -</dd> -<dt><i>ui</i> (QWidget)</dt> -<dd> -reference to a UI widget (defaults to None) -</dd> -</dl> -<a NAME="Purge.__getEntries" ID="Purge.__getEntries"></a> -<h4>Purge.__getEntries</h4> -<b>__getEntries</b>(<i>deleteAll</i>) -<p> - Private method to get a list of files/directories being purged. -</p> - -<dl> - -<dt><i>deleteAll</i> (bool)</dt> -<dd> -flag indicating to delete all files including ignored - ones -</dd> -</dl> -<dl> -<dt>Return:</dt> -<dd> -name of the current patch -</dd> -</dl> -<dl> -<dt>Return Type:</dt> -<dd> -str -</dd> -</dl> -<a NAME="Purge.hgPurge" ID="Purge.hgPurge"></a> -<h4>Purge.hgPurge</h4> -<b>hgPurge</b>(<i>deleteAll=False</i>) -<p> - Public method to purge files and directories not tracked by Mercurial. -</p> - -<dl> - -<dt><i>deleteAll</i> (bool)</dt> -<dd> -flag indicating to delete all files including ignored - ones -</dd> -</dl> -<a NAME="Purge.hgPurgeList" ID="Purge.hgPurgeList"></a> -<h4>Purge.hgPurgeList</h4> -<b>hgPurgeList</b>(<i>deleteAll=False</i>) -<p> - Public method to list files and directories not tracked by Mercurial. -</p> - -<dl> - -<dt><i>deleteAll</i> (bool)</dt> -<dd> -flag indicating to list all files including ignored - ones -</dd> -</dl> -<a NAME="Purge.shutdown" ID="Purge.shutdown"></a> -<h4>Purge.shutdown</h4> -<b>shutdown</b>(<i></i>) -<p> - Public method used to shutdown the purge interface. -</p> - -<div align="right"><a href="#top">Up</a></div> -<hr /> -</body></html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveBrowserDialog.html Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,341 @@ +<!DOCTYPE html> +<html><head> +<title>eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveBrowserDialog</title> +<meta charset="UTF-8"> +<link rel="stylesheet" href="styles.css"> +</head> +<body> +<a NAME="top" ID="top"></a> +<h1>eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveBrowserDialog</h1> +<p> +Module implementing Mercurial shelve browser dialog. +</p> + +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Classes</h3> +<table> +<tr> +<td><a href="#HgShelveBrowserDialog">HgShelveBrowserDialog</a></td> +<td>Class implementing Mercurial shelve browser dialog.</td> +</tr> +</table> + +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> + +<hr /> +<hr /> +<a NAME="HgShelveBrowserDialog" ID="HgShelveBrowserDialog"></a> +<h2>HgShelveBrowserDialog</h2> +<p> + Class implementing Mercurial shelve browser dialog. +</p> + +<h3>Derived from</h3> +QWidget, Ui_HgShelveBrowserDialog +<h3>Class Attributes</h3> +<table> +<tr><td>AgeColumn</td></tr> +<tr><td>MessageColumn</td></tr> +<tr><td>NameColumn</td></tr> +</table> + +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Methods</h3> +<table> +<tr> +<td><a href="#HgShelveBrowserDialog.__init__">HgShelveBrowserDialog</a></td> +<td>Constructor</td> +</tr> +<tr> +<td><a href="#HgShelveBrowserDialog.__cleanupShelves">__cleanupShelves</a></td> +<td>Private slot to delete all shelves.</td> +</tr> +<tr> +<td><a href="#HgShelveBrowserDialog.__deleteShelves">__deleteShelves</a></td> +<td>Private slot to delete the selected shelves.</td> +</tr> +<tr> +<td><a href="#HgShelveBrowserDialog.__finish">__finish</a></td> +<td>Private slot called when the process finished or the user pressed the button.</td> +</tr> +<tr> +<td><a href="#HgShelveBrowserDialog.__generateShelveEntry">__generateShelveEntry</a></td> +<td>Private method to generate the shelve items.</td> +</tr> +<tr> +<td><a href="#HgShelveBrowserDialog.__getShelveEntries">__getShelveEntries</a></td> +<td>Private method to retrieve the list of shelves.</td> +</tr> +<tr> +<td><a href="#HgShelveBrowserDialog.__processBuffer">__processBuffer</a></td> +<td>Private method to process the buffered output of the hg shelve command.</td> +</tr> +<tr> +<td><a href="#HgShelveBrowserDialog.__resetUI">__resetUI</a></td> +<td>Private method to reset the user interface.</td> +</tr> +<tr> +<td><a href="#HgShelveBrowserDialog.__resizeColumnsShelves">__resizeColumnsShelves</a></td> +<td>Private method to resize the shelve list columns.</td> +</tr> +<tr> +<td><a href="#HgShelveBrowserDialog.__showError">__showError</a></td> +<td>Private slot to show some error.</td> +</tr> +<tr> +<td><a href="#HgShelveBrowserDialog.__unshelve">__unshelve</a></td> +<td>Private slot to restore the selected shelve of changes.</td> +</tr> +<tr> +<td><a href="#HgShelveBrowserDialog.closeEvent">closeEvent</a></td> +<td>Protected slot implementing a close event handler.</td> +</tr> +<tr> +<td><a href="#HgShelveBrowserDialog.on_buttonBox_clicked">on_buttonBox_clicked</a></td> +<td>Private slot called by a button of the button box clicked.</td> +</tr> +<tr> +<td><a href="#HgShelveBrowserDialog.on_refreshButton_clicked">on_refreshButton_clicked</a></td> +<td>Private slot to refresh the list of shelves.</td> +</tr> +<tr> +<td><a href="#HgShelveBrowserDialog.on_shelveList_currentItemChanged">on_shelveList_currentItemChanged</a></td> +<td>Private slot called, when the current item of the shelve list changes.</td> +</tr> +<tr> +<td><a href="#HgShelveBrowserDialog.on_shelveList_customContextMenuRequested">on_shelveList_customContextMenuRequested</a></td> +<td>Private slot to show the context menu of the shelve list.</td> +</tr> +<tr> +<td><a href="#HgShelveBrowserDialog.show">show</a></td> +<td>Public slot to show the dialog.</td> +</tr> +<tr> +<td><a href="#HgShelveBrowserDialog.start">start</a></td> +<td>Public slot to start the hg shelve command.</td> +</tr> +</table> + +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> + + +<a NAME="HgShelveBrowserDialog.__init__" ID="HgShelveBrowserDialog.__init__"></a> +<h4>HgShelveBrowserDialog (Constructor)</h4> +<b>HgShelveBrowserDialog</b>(<i>vcs, parent=None</i>) +<p> + Constructor +</p> + +<dl> + +<dt><i>vcs</i> (Hg)</dt> +<dd> +reference to the vcs object +</dd> +<dt><i>parent</i> (QWidget)</dt> +<dd> +parent widget +</dd> +</dl> +<a NAME="HgShelveBrowserDialog.__cleanupShelves" ID="HgShelveBrowserDialog.__cleanupShelves"></a> +<h4>HgShelveBrowserDialog.__cleanupShelves</h4> +<b>__cleanupShelves</b>(<i></i>) +<p> + Private slot to delete all shelves. +</p> + +<a NAME="HgShelveBrowserDialog.__deleteShelves" ID="HgShelveBrowserDialog.__deleteShelves"></a> +<h4>HgShelveBrowserDialog.__deleteShelves</h4> +<b>__deleteShelves</b>(<i></i>) +<p> + Private slot to delete the selected shelves. +</p> + +<a NAME="HgShelveBrowserDialog.__finish" ID="HgShelveBrowserDialog.__finish"></a> +<h4>HgShelveBrowserDialog.__finish</h4> +<b>__finish</b>(<i></i>) +<p> + Private slot called when the process finished or the user pressed + the button. +</p> + +<a NAME="HgShelveBrowserDialog.__generateShelveEntry" ID="HgShelveBrowserDialog.__generateShelveEntry"></a> +<h4>HgShelveBrowserDialog.__generateShelveEntry</h4> +<b>__generateShelveEntry</b>(<i>name, age, message, fileStatistics, totals</i>) +<p> + Private method to generate the shelve items. +</p> + +<dl> + +<dt><i>name</i> (str)</dt> +<dd> +name of the shelve +</dd> +<dt><i>age</i> (str)</dt> +<dd> +age of the shelve +</dd> +<dt><i>message</i> (str)</dt> +<dd> +shelve message +</dd> +<dt><i>fileStatistics</i> (tuple of (str, str, str, str))</dt> +<dd> +per file change statistics (tuple containing the + file name, the number of changes, the number of added lines and the + number of deleted lines) +</dd> +<dt><i>totals</i> (tuple of (str, str, str))</dt> +<dd> +overall statistics (tuple containing the number of changed files, + the number of added lines and the number of deleted lines) +</dd> +</dl> +<a NAME="HgShelveBrowserDialog.__getShelveEntries" ID="HgShelveBrowserDialog.__getShelveEntries"></a> +<h4>HgShelveBrowserDialog.__getShelveEntries</h4> +<b>__getShelveEntries</b>(<i></i>) +<p> + Private method to retrieve the list of shelves. +</p> + +<a NAME="HgShelveBrowserDialog.__processBuffer" ID="HgShelveBrowserDialog.__processBuffer"></a> +<h4>HgShelveBrowserDialog.__processBuffer</h4> +<b>__processBuffer</b>(<i></i>) +<p> + Private method to process the buffered output of the hg shelve command. +</p> + +<a NAME="HgShelveBrowserDialog.__resetUI" ID="HgShelveBrowserDialog.__resetUI"></a> +<h4>HgShelveBrowserDialog.__resetUI</h4> +<b>__resetUI</b>(<i></i>) +<p> + Private method to reset the user interface. +</p> + +<a NAME="HgShelveBrowserDialog.__resizeColumnsShelves" ID="HgShelveBrowserDialog.__resizeColumnsShelves"></a> +<h4>HgShelveBrowserDialog.__resizeColumnsShelves</h4> +<b>__resizeColumnsShelves</b>(<i></i>) +<p> + Private method to resize the shelve list columns. +</p> + +<a NAME="HgShelveBrowserDialog.__showError" ID="HgShelveBrowserDialog.__showError"></a> +<h4>HgShelveBrowserDialog.__showError</h4> +<b>__showError</b>(<i>out</i>) +<p> + Private slot to show some error. +</p> + +<dl> + +<dt><i>out</i> (str)</dt> +<dd> +error to be shown +</dd> +</dl> +<a NAME="HgShelveBrowserDialog.__unshelve" ID="HgShelveBrowserDialog.__unshelve"></a> +<h4>HgShelveBrowserDialog.__unshelve</h4> +<b>__unshelve</b>(<i></i>) +<p> + Private slot to restore the selected shelve of changes. +</p> + +<a NAME="HgShelveBrowserDialog.closeEvent" ID="HgShelveBrowserDialog.closeEvent"></a> +<h4>HgShelveBrowserDialog.closeEvent</h4> +<b>closeEvent</b>(<i>e</i>) +<p> + Protected slot implementing a close event handler. +</p> + +<dl> + +<dt><i>e</i> (QCloseEvent)</dt> +<dd> +close event +</dd> +</dl> +<a NAME="HgShelveBrowserDialog.on_buttonBox_clicked" ID="HgShelveBrowserDialog.on_buttonBox_clicked"></a> +<h4>HgShelveBrowserDialog.on_buttonBox_clicked</h4> +<b>on_buttonBox_clicked</b>(<i>button</i>) +<p> + Private slot called by a button of the button box clicked. +</p> + +<dl> + +<dt><i>button</i> (QAbstractButton)</dt> +<dd> +button that was clicked +</dd> +</dl> +<a NAME="HgShelveBrowserDialog.on_refreshButton_clicked" ID="HgShelveBrowserDialog.on_refreshButton_clicked"></a> +<h4>HgShelveBrowserDialog.on_refreshButton_clicked</h4> +<b>on_refreshButton_clicked</b>(<i></i>) +<p> + Private slot to refresh the list of shelves. +</p> + +<a NAME="HgShelveBrowserDialog.on_shelveList_currentItemChanged" ID="HgShelveBrowserDialog.on_shelveList_currentItemChanged"></a> +<h4>HgShelveBrowserDialog.on_shelveList_currentItemChanged</h4> +<b>on_shelveList_currentItemChanged</b>(<i>current, _previous</i>) +<p> + Private slot called, when the current item of the shelve list changes. +</p> + +<dl> + +<dt><i>current</i> (QTreeWidgetItem)</dt> +<dd> +reference to the new current item +</dd> +<dt><i>_previous</i> (QTreeWidgetItem)</dt> +<dd> +reference to the old current item (unused) +</dd> +</dl> +<a NAME="HgShelveBrowserDialog.on_shelveList_customContextMenuRequested" ID="HgShelveBrowserDialog.on_shelveList_customContextMenuRequested"></a> +<h4>HgShelveBrowserDialog.on_shelveList_customContextMenuRequested</h4> +<b>on_shelveList_customContextMenuRequested</b>(<i>pos</i>) +<p> + Private slot to show the context menu of the shelve list. +</p> + +<dl> + +<dt><i>pos</i> (QPoint)</dt> +<dd> +position of the mouse pointer +</dd> +</dl> +<a NAME="HgShelveBrowserDialog.show" ID="HgShelveBrowserDialog.show"></a> +<h4>HgShelveBrowserDialog.show</h4> +<b>show</b>(<i></i>) +<p> + Public slot to show the dialog. +</p> + +<a NAME="HgShelveBrowserDialog.start" ID="HgShelveBrowserDialog.start"></a> +<h4>HgShelveBrowserDialog.start</h4> +<b>start</b>(<i></i>) +<p> + Public slot to start the hg shelve command. +</p> + +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveDataDialog.html Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,111 @@ +<!DOCTYPE html> +<html><head> +<title>eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveDataDialog</title> +<meta charset="UTF-8"> +<link rel="stylesheet" href="styles.css"> +</head> +<body> +<a NAME="top" ID="top"></a> +<h1>eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveDataDialog</h1> +<p> +Module implementing a dialog to enter the data for a shelve operation. +</p> + +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Classes</h3> +<table> +<tr> +<td><a href="#HgShelveDataDialog">HgShelveDataDialog</a></td> +<td>Class implementing a dialog to enter the data for a shelve operation.</td> +</tr> +</table> + +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> + +<hr /> +<hr /> +<a NAME="HgShelveDataDialog" ID="HgShelveDataDialog"></a> +<h2>HgShelveDataDialog</h2> +<p> + Class implementing a dialog to enter the data for a shelve operation. +</p> + +<h3>Derived from</h3> +QDialog, Ui_HgShelveDataDialog +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Methods</h3> +<table> +<tr> +<td><a href="#HgShelveDataDialog.__init__">HgShelveDataDialog</a></td> +<td>Constructor</td> +</tr> +<tr> +<td><a href="#HgShelveDataDialog.getData">getData</a></td> +<td>Public method to get the user data.</td> +</tr> +</table> + +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> + + +<a NAME="HgShelveDataDialog.__init__" ID="HgShelveDataDialog.__init__"></a> +<h4>HgShelveDataDialog (Constructor)</h4> +<b>HgShelveDataDialog</b>(<i>version, parent=None</i>) +<p> + Constructor +</p> + +<dl> + +<dt><i>version</i> (tuple of three int)</dt> +<dd> +Mercurial version +</dd> +<dt><i>parent</i> (QWidget)</dt> +<dd> +reference to the parent widget +</dd> +</dl> +<a NAME="HgShelveDataDialog.getData" ID="HgShelveDataDialog.getData"></a> +<h4>HgShelveDataDialog.getData</h4> +<b>getData</b>(<i></i>) +<p> + Public method to get the user data. +</p> + +<dl> +<dt>Return:</dt> +<dd> +tuple containing the name, date, message, a flag indicating + to add/remove new/missing files and a flag indicating to keep the + shelved changes in the working directory +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +tuple of (str, QDateTime, str, bool, bool) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelvesSelectionDialog.html Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,124 @@ +<!DOCTYPE html> +<html><head> +<title>eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelvesSelectionDialog</title> +<meta charset="UTF-8"> +<link rel="stylesheet" href="styles.css"> +</head> +<body> +<a NAME="top" ID="top"></a> +<h1>eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelvesSelectionDialog</h1> +<p> +Module implementing a dialog to select multiple shelve names. +</p> + +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Classes</h3> +<table> +<tr> +<td><a href="#HgShelvesSelectionDialog">HgShelvesSelectionDialog</a></td> +<td>Class implementing a dialog to select multiple shelve names.</td> +</tr> +</table> + +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> + +<hr /> +<hr /> +<a NAME="HgShelvesSelectionDialog" ID="HgShelvesSelectionDialog"></a> +<h2>HgShelvesSelectionDialog</h2> +<p> + Class implementing a dialog to select multiple shelve names. +</p> + +<h3>Derived from</h3> +QDialog, Ui_HgShelvesSelectionDialog +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Methods</h3> +<table> +<tr> +<td><a href="#HgShelvesSelectionDialog.__init__">HgShelvesSelectionDialog</a></td> +<td>Constructor</td> +</tr> +<tr> +<td><a href="#HgShelvesSelectionDialog.getSelectedShelves">getSelectedShelves</a></td> +<td>Public method to retrieve the selected shelve names.</td> +</tr> +<tr> +<td><a href="#HgShelvesSelectionDialog.on_shelvesList_itemSelectionChanged">on_shelvesList_itemSelectionChanged</a></td> +<td>Private slot to enabled the OK button if items have been selected.</td> +</tr> +</table> + +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> + + +<a NAME="HgShelvesSelectionDialog.__init__" ID="HgShelvesSelectionDialog.__init__"></a> +<h4>HgShelvesSelectionDialog (Constructor)</h4> +<b>HgShelvesSelectionDialog</b>(<i>message, shelveNames, parent=None</i>) +<p> + Constructor +</p> + +<dl> + +<dt><i>message</i> (str)</dt> +<dd> +message to be shown +</dd> +<dt><i>shelveNames</i> (list of str)</dt> +<dd> +list of shelve names +</dd> +<dt><i>parent</i> (QWidget)</dt> +<dd> +reference to the parent widget +</dd> +</dl> +<a NAME="HgShelvesSelectionDialog.getSelectedShelves" ID="HgShelvesSelectionDialog.getSelectedShelves"></a> +<h4>HgShelvesSelectionDialog.getSelectedShelves</h4> +<b>getSelectedShelves</b>(<i></i>) +<p> + Public method to retrieve the selected shelve names. +</p> + +<dl> +<dt>Return:</dt> +<dd> +selected shelve names +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +list of str +</dd> +</dl> +<a NAME="HgShelvesSelectionDialog.on_shelvesList_itemSelectionChanged" ID="HgShelvesSelectionDialog.on_shelvesList_itemSelectionChanged"></a> +<h4>HgShelvesSelectionDialog.on_shelvesList_itemSelectionChanged</h4> +<b>on_shelvesList_itemSelectionChanged</b>(<i></i>) +<p> + Private slot to enabled the OK button if items have been selected. +</p> + +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgUnshelveDataDialog.html Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,114 @@ +<!DOCTYPE html> +<html><head> +<title>eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgUnshelveDataDialog</title> +<meta charset="UTF-8"> +<link rel="stylesheet" href="styles.css"> +</head> +<body> +<a NAME="top" ID="top"></a> +<h1>eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgUnshelveDataDialog</h1> +<p> +Module implementing a dialog to enter the data for an unshelve operation. +</p> + +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Classes</h3> +<table> +<tr> +<td><a href="#HgUnshelveDataDialog">HgUnshelveDataDialog</a></td> +<td>Class implementing a dialog to enter the data for an unshelve operation.</td> +</tr> +</table> + +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> + +<hr /> +<hr /> +<a NAME="HgUnshelveDataDialog" ID="HgUnshelveDataDialog"></a> +<h2>HgUnshelveDataDialog</h2> +<p> + Class implementing a dialog to enter the data for an unshelve operation. +</p> + +<h3>Derived from</h3> +QDialog, Ui_HgUnshelveDataDialog +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Methods</h3> +<table> +<tr> +<td><a href="#HgUnshelveDataDialog.__init__">HgUnshelveDataDialog</a></td> +<td>Constructor</td> +</tr> +<tr> +<td><a href="#HgUnshelveDataDialog.getData">getData</a></td> +<td>Public method to get the user data.</td> +</tr> +</table> + +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> + + +<a NAME="HgUnshelveDataDialog.__init__" ID="HgUnshelveDataDialog.__init__"></a> +<h4>HgUnshelveDataDialog (Constructor)</h4> +<b>HgUnshelveDataDialog</b>(<i>shelveNames, shelveName="", parent=None</i>) +<p> + Constructor +</p> + +<dl> + +<dt><i>shelveNames</i> (list of str)</dt> +<dd> +list of available shelves +</dd> +<dt><i>shelveName</i> (str)</dt> +<dd> +name of the shelve to restore +</dd> +<dt><i>parent</i> (QWidget)</dt> +<dd> +reference to the parent widget +</dd> +</dl> +<a NAME="HgUnshelveDataDialog.getData" ID="HgUnshelveDataDialog.getData"></a> +<h4>HgUnshelveDataDialog.getData</h4> +<b>getData</b>(<i></i>) +<p> + Public method to get the user data. +</p> + +<dl> +<dt>Return:</dt> +<dd> +tuple containing the name and a flag indicating to keep the + shelved change +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +tuple of (str, bool) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.ProjectBrowserHelper.html Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,195 @@ +<!DOCTYPE html> +<html><head> +<title>eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.ProjectBrowserHelper</title> +<meta charset="UTF-8"> +<link rel="stylesheet" href="styles.css"> +</head> +<body> +<a NAME="top" ID="top"></a> +<h1>eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.ProjectBrowserHelper</h1> +<p> +Module implementing the shelve extension project browser helper. +</p> + +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Classes</h3> +<table> +<tr> +<td><a href="#ShelveProjectBrowserHelper">ShelveProjectBrowserHelper</a></td> +<td>Class implementing the shelve extension project browser helper.</td> +</tr> +</table> + +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> + +<hr /> +<hr /> +<a NAME="ShelveProjectBrowserHelper" ID="ShelveProjectBrowserHelper"></a> +<h2>ShelveProjectBrowserHelper</h2> +<p> + Class implementing the shelve extension project browser helper. +</p> + +<h3>Derived from</h3> +HgExtensionProjectBrowserHelper +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Methods</h3> +<table> +<tr> +<td><a href="#ShelveProjectBrowserHelper.__init__">ShelveProjectBrowserHelper</a></td> +<td>Constructor</td> +</tr> +<tr> +<td><a href="#ShelveProjectBrowserHelper.__hgShelve">__hgShelve</a></td> +<td>Private slot used to shelve all current changes.</td> +</tr> +<tr> +<td><a href="#ShelveProjectBrowserHelper.__reopenProject">__reopenProject</a></td> +<td>Private method to reopen the project if needed and wanted.</td> +</tr> +<tr> +<td><a href="#ShelveProjectBrowserHelper.initMenus">initMenus</a></td> +<td>Public method to generate the extension menus.</td> +</tr> +<tr> +<td><a href="#ShelveProjectBrowserHelper.menuTitle">menuTitle</a></td> +<td>Public method to get the menu title.</td> +</tr> +<tr> +<td><a href="#ShelveProjectBrowserHelper.showMenu">showMenu</a></td> +<td>Public method to prepare the extension menu for display.</td> +</tr> +</table> + +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> + + +<a NAME="ShelveProjectBrowserHelper.__init__" ID="ShelveProjectBrowserHelper.__init__"></a> +<h4>ShelveProjectBrowserHelper (Constructor)</h4> +<b>ShelveProjectBrowserHelper</b>(<i>vcsObject, browserObject, projectObject</i>) +<p> + Constructor +</p> + +<dl> + +<dt><i>vcsObject</i> (Hg)</dt> +<dd> +reference to the vcs object +</dd> +<dt><i>browserObject</i> (ProjectBaseBrowser)</dt> +<dd> +reference to the project browser object +</dd> +<dt><i>projectObject</i> (Project)</dt> +<dd> +reference to the project object +</dd> +</dl> +<a NAME="ShelveProjectBrowserHelper.__hgShelve" ID="ShelveProjectBrowserHelper.__hgShelve"></a> +<h4>ShelveProjectBrowserHelper.__hgShelve</h4> +<b>__hgShelve</b>(<i></i>) +<p> + Private slot used to shelve all current changes. +</p> + +<a NAME="ShelveProjectBrowserHelper.__reopenProject" ID="ShelveProjectBrowserHelper.__reopenProject"></a> +<h4>ShelveProjectBrowserHelper.__reopenProject</h4> +<b>__reopenProject</b>(<i>shouldReopen, title</i>) +<p> + Private method to reopen the project if needed and wanted. +</p> + +<dl> + +<dt><i>shouldReopen</i> (bool)</dt> +<dd> +flag indicating that the project should + be reopened +</dd> +<dt><i>title</i> (str)</dt> +<dd> +title of the message box +</dd> +</dl> +<a NAME="ShelveProjectBrowserHelper.initMenus" ID="ShelveProjectBrowserHelper.initMenus"></a> +<h4>ShelveProjectBrowserHelper.initMenus</h4> +<b>initMenus</b>(<i></i>) +<p> + Public method to generate the extension menus. +</p> + +<dl> +<dt>Return:</dt> +<dd> +dictionary of populated menu. The dict must have the keys 'mainMenu', + 'multiMenu', 'backMenu', 'dirMenu' and 'dirMultiMenu'. +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +dict of QMenu +</dd> +</dl> +<a NAME="ShelveProjectBrowserHelper.menuTitle" ID="ShelveProjectBrowserHelper.menuTitle"></a> +<h4>ShelveProjectBrowserHelper.menuTitle</h4> +<b>menuTitle</b>(<i></i>) +<p> + Public method to get the menu title. +</p> + +<dl> +<dt>Return:</dt> +<dd> +title of the menu +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl> +<a NAME="ShelveProjectBrowserHelper.showMenu" ID="ShelveProjectBrowserHelper.showMenu"></a> +<h4>ShelveProjectBrowserHelper.showMenu</h4> +<b>showMenu</b>(<i>key, controlled</i>) +<p> + Public method to prepare the extension menu for display. +</p> + +<dl> + +<dt><i>key</i> (str)</dt> +<dd> +menu key (one of 'mainMenu', 'multiMenu', 'backMenu', 'dirMenu' + or 'dirMultiMenu') +</dd> +<dt><i>controlled</i> (bool)</dt> +<dd> +flag indicating to prepare the menu for a + version controlled entry or a non-version controlled entry +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.ProjectHelper.html Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,239 @@ +<!DOCTYPE html> +<html><head> +<title>eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.ProjectHelper</title> +<meta charset="UTF-8"> +<link rel="stylesheet" href="styles.css"> +</head> +<body> +<a NAME="top" ID="top"></a> +<h1>eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.ProjectHelper</h1> +<p> +Module implementing the shelve extension project helper. +</p> + +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Classes</h3> +<table> +<tr> +<td><a href="#ShelveProjectHelper">ShelveProjectHelper</a></td> +<td>Class implementing the shelve extension project helper.</td> +</tr> +</table> + +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> + +<hr /> +<hr /> +<a NAME="ShelveProjectHelper" ID="ShelveProjectHelper"></a> +<h2>ShelveProjectHelper</h2> +<p> + Class implementing the shelve extension project helper. +</p> + +<h3>Derived from</h3> +HgExtensionProjectHelper +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Methods</h3> +<table> +<tr> +<td><a href="#ShelveProjectHelper.__init__">ShelveProjectHelper</a></td> +<td>Constructor</td> +</tr> +<tr> +<td><a href="#ShelveProjectHelper.__hgCleanupShelves">__hgCleanupShelves</a></td> +<td>Private slot to delete all shelves.</td> +</tr> +<tr> +<td><a href="#ShelveProjectHelper.__hgDeleteShelves">__hgDeleteShelves</a></td> +<td>Private slot to delete selected shelves.</td> +</tr> +<tr> +<td><a href="#ShelveProjectHelper.__hgShelve">__hgShelve</a></td> +<td>Private slot used to shelve all current changes.</td> +</tr> +<tr> +<td><a href="#ShelveProjectHelper.__hgShelveBrowser">__hgShelveBrowser</a></td> +<td>Private slot to show the shelve browser dialog.</td> +</tr> +<tr> +<td><a href="#ShelveProjectHelper.__hgUnshelve">__hgUnshelve</a></td> +<td>Private slot used to restore a shelved change.</td> +</tr> +<tr> +<td><a href="#ShelveProjectHelper.__hgUnshelveAbort">__hgUnshelveAbort</a></td> +<td>Private slot used to abort an ongoing restore operation.</td> +</tr> +<tr> +<td><a href="#ShelveProjectHelper.__hgUnshelveContinue">__hgUnshelveContinue</a></td> +<td>Private slot used to continue an ongoing restore operation.</td> +</tr> +<tr> +<td><a href="#ShelveProjectHelper.__reopenProject">__reopenProject</a></td> +<td>Private method to reopen the project if needed and wanted.</td> +</tr> +<tr> +<td><a href="#ShelveProjectHelper.initActions">initActions</a></td> +<td>Public method to generate the action objects.</td> +</tr> +<tr> +<td><a href="#ShelveProjectHelper.initMenu">initMenu</a></td> +<td>Public method to generate the extension menu.</td> +</tr> +<tr> +<td><a href="#ShelveProjectHelper.menuTitle">menuTitle</a></td> +<td>Public method to get the menu title.</td> +</tr> +</table> + +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> + + +<a NAME="ShelveProjectHelper.__init__" ID="ShelveProjectHelper.__init__"></a> +<h4>ShelveProjectHelper (Constructor)</h4> +<b>ShelveProjectHelper</b>(<i></i>) +<p> + Constructor +</p> + +<a NAME="ShelveProjectHelper.__hgCleanupShelves" ID="ShelveProjectHelper.__hgCleanupShelves"></a> +<h4>ShelveProjectHelper.__hgCleanupShelves</h4> +<b>__hgCleanupShelves</b>(<i></i>) +<p> + Private slot to delete all shelves. +</p> + +<a NAME="ShelveProjectHelper.__hgDeleteShelves" ID="ShelveProjectHelper.__hgDeleteShelves"></a> +<h4>ShelveProjectHelper.__hgDeleteShelves</h4> +<b>__hgDeleteShelves</b>(<i></i>) +<p> + Private slot to delete selected shelves. +</p> + +<a NAME="ShelveProjectHelper.__hgShelve" ID="ShelveProjectHelper.__hgShelve"></a> +<h4>ShelveProjectHelper.__hgShelve</h4> +<b>__hgShelve</b>(<i></i>) +<p> + Private slot used to shelve all current changes. +</p> + +<a NAME="ShelveProjectHelper.__hgShelveBrowser" ID="ShelveProjectHelper.__hgShelveBrowser"></a> +<h4>ShelveProjectHelper.__hgShelveBrowser</h4> +<b>__hgShelveBrowser</b>(<i></i>) +<p> + Private slot to show the shelve browser dialog. +</p> + +<a NAME="ShelveProjectHelper.__hgUnshelve" ID="ShelveProjectHelper.__hgUnshelve"></a> +<h4>ShelveProjectHelper.__hgUnshelve</h4> +<b>__hgUnshelve</b>(<i></i>) +<p> + Private slot used to restore a shelved change. +</p> + +<a NAME="ShelveProjectHelper.__hgUnshelveAbort" ID="ShelveProjectHelper.__hgUnshelveAbort"></a> +<h4>ShelveProjectHelper.__hgUnshelveAbort</h4> +<b>__hgUnshelveAbort</b>(<i></i>) +<p> + Private slot used to abort an ongoing restore operation. +</p> + +<a NAME="ShelveProjectHelper.__hgUnshelveContinue" ID="ShelveProjectHelper.__hgUnshelveContinue"></a> +<h4>ShelveProjectHelper.__hgUnshelveContinue</h4> +<b>__hgUnshelveContinue</b>(<i></i>) +<p> + Private slot used to continue an ongoing restore operation. +</p> + +<a NAME="ShelveProjectHelper.__reopenProject" ID="ShelveProjectHelper.__reopenProject"></a> +<h4>ShelveProjectHelper.__reopenProject</h4> +<b>__reopenProject</b>(<i>shouldReopen, title</i>) +<p> + Private method to reopen the project if needed and wanted. +</p> + +<dl> + +<dt><i>shouldReopen</i> (bool)</dt> +<dd> +flag indicating that the project should + be reopened +</dd> +<dt><i>title</i> (str)</dt> +<dd> +title of the message box +</dd> +</dl> +<a NAME="ShelveProjectHelper.initActions" ID="ShelveProjectHelper.initActions"></a> +<h4>ShelveProjectHelper.initActions</h4> +<b>initActions</b>(<i></i>) +<p> + Public method to generate the action objects. +</p> + +<a NAME="ShelveProjectHelper.initMenu" ID="ShelveProjectHelper.initMenu"></a> +<h4>ShelveProjectHelper.initMenu</h4> +<b>initMenu</b>(<i>mainMenu</i>) +<p> + Public method to generate the extension menu. +</p> + +<dl> + +<dt><i>mainMenu</i> (QMenu)</dt> +<dd> +reference to the main menu +</dd> +</dl> +<dl> +<dt>Return:</dt> +<dd> +populated menu +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +QMenu +</dd> +</dl> +<a NAME="ShelveProjectHelper.menuTitle" ID="ShelveProjectHelper.menuTitle"></a> +<h4>ShelveProjectHelper.menuTitle</h4> +<b>menuTitle</b>(<i></i>) +<p> + Public method to get the menu title. +</p> + +<dl> +<dt>Return:</dt> +<dd> +title of the menu +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.shelve.html Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,267 @@ +<!DOCTYPE html> +<html><head> +<title>eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.shelve</title> +<meta charset="UTF-8"> +<link rel="stylesheet" href="styles.css"> +</head> +<body> +<a NAME="top" ID="top"></a> +<h1>eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.shelve</h1> +<p> +Module implementing the shelve extension interface. +</p> + +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Classes</h3> +<table> +<tr> +<td><a href="#Shelve">Shelve</a></td> +<td>Class implementing the shelve extension interface.</td> +</tr> +</table> + +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> + +<hr /> +<hr /> +<a NAME="Shelve" ID="Shelve"></a> +<h2>Shelve</h2> +<p> + Class implementing the shelve extension interface. +</p> + +<h3>Derived from</h3> +HgExtension +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Methods</h3> +<table> +<tr> +<td><a href="#Shelve.__init__">Shelve</a></td> +<td>Constructor</td> +</tr> +<tr> +<td><a href="#Shelve.__hgGetShelveNamesList">__hgGetShelveNamesList</a></td> +<td>Private method to get the list of shelved changes.</td> +</tr> +<tr> +<td><a href="#Shelve.hgCleanupShelves">hgCleanupShelves</a></td> +<td>Public method to delete all shelves.</td> +</tr> +<tr> +<td><a href="#Shelve.hgDeleteShelves">hgDeleteShelves</a></td> +<td>Public method to delete named shelves.</td> +</tr> +<tr> +<td><a href="#Shelve.hgShelve">hgShelve</a></td> +<td>Public method to shelve current changes of files or directories.</td> +</tr> +<tr> +<td><a href="#Shelve.hgShelveBrowser">hgShelveBrowser</a></td> +<td>Public method to show the shelve browser dialog.</td> +</tr> +<tr> +<td><a href="#Shelve.hgUnshelve">hgUnshelve</a></td> +<td>Public method to restore shelved changes to the project directory.</td> +</tr> +<tr> +<td><a href="#Shelve.hgUnshelveAbort">hgUnshelveAbort</a></td> +<td>Public method to abort the ongoing restore operation.</td> +</tr> +<tr> +<td><a href="#Shelve.hgUnshelveContinue">hgUnshelveContinue</a></td> +<td>Public method to continue the ongoing restore operation.</td> +</tr> +<tr> +<td><a href="#Shelve.shutdown">shutdown</a></td> +<td>Public method used to shutdown the shelve interface.</td> +</tr> +</table> + +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> + + +<a NAME="Shelve.__init__" ID="Shelve.__init__"></a> +<h4>Shelve (Constructor)</h4> +<b>Shelve</b>(<i>vcs, ui=None</i>) +<p> + Constructor +</p> + +<dl> + +<dt><i>vcs</i> (Hg)</dt> +<dd> +reference to the Mercurial vcs object +</dd> +<dt><i>ui</i> (QWidget)</dt> +<dd> +reference to a UI widget (defaults to None) +</dd> +</dl> +<a NAME="Shelve.__hgGetShelveNamesList" ID="Shelve.__hgGetShelveNamesList"></a> +<h4>Shelve.__hgGetShelveNamesList</h4> +<b>__hgGetShelveNamesList</b>(<i></i>) +<p> + Private method to get the list of shelved changes. +</p> + +<dl> +<dt>Return:</dt> +<dd> +list of shelved changes +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +list of str +</dd> +</dl> +<a NAME="Shelve.hgCleanupShelves" ID="Shelve.hgCleanupShelves"></a> +<h4>Shelve.hgCleanupShelves</h4> +<b>hgCleanupShelves</b>(<i></i>) +<p> + Public method to delete all shelves. +</p> + +<a NAME="Shelve.hgDeleteShelves" ID="Shelve.hgDeleteShelves"></a> +<h4>Shelve.hgDeleteShelves</h4> +<b>hgDeleteShelves</b>(<i>shelveNames=None</i>) +<p> + Public method to delete named shelves. +</p> + +<dl> + +<dt><i>shelveNames</i> (list of str)</dt> +<dd> +name of shelves to delete +</dd> +</dl> +<a NAME="Shelve.hgShelve" ID="Shelve.hgShelve"></a> +<h4>Shelve.hgShelve</h4> +<b>hgShelve</b>(<i>name</i>) +<p> + Public method to shelve current changes of files or directories. +</p> + +<dl> + +<dt><i>name</i> (list of str)</dt> +<dd> +directory or file name (string) or list of directory + or file names +</dd> +</dl> +<dl> +<dt>Return:</dt> +<dd> +flag indicating that the project should be reread +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl> +<a NAME="Shelve.hgShelveBrowser" ID="Shelve.hgShelveBrowser"></a> +<h4>Shelve.hgShelveBrowser</h4> +<b>hgShelveBrowser</b>(<i></i>) +<p> + Public method to show the shelve browser dialog. +</p> + +<a NAME="Shelve.hgUnshelve" ID="Shelve.hgUnshelve"></a> +<h4>Shelve.hgUnshelve</h4> +<b>hgUnshelve</b>(<i>shelveName=""</i>) +<p> + Public method to restore shelved changes to the project directory. +</p> + +<dl> + +<dt><i>shelveName</i> (str)</dt> +<dd> +name of the shelve to restore +</dd> +</dl> +<dl> +<dt>Return:</dt> +<dd> +flag indicating that the project should be reread +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl> +<a NAME="Shelve.hgUnshelveAbort" ID="Shelve.hgUnshelveAbort"></a> +<h4>Shelve.hgUnshelveAbort</h4> +<b>hgUnshelveAbort</b>(<i></i>) +<p> + Public method to abort the ongoing restore operation. +</p> + +<dl> +<dt>Return:</dt> +<dd> +flag indicating that the project should be reread +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl> +<a NAME="Shelve.hgUnshelveContinue" ID="Shelve.hgUnshelveContinue"></a> +<h4>Shelve.hgUnshelveContinue</h4> +<b>hgUnshelveContinue</b>(<i></i>) +<p> + Public method to continue the ongoing restore operation. +</p> + +<dl> +<dt>Return:</dt> +<dd> +flag indicating that the project should be reread +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl> +<a NAME="Shelve.shutdown" ID="Shelve.shutdown"></a> +<h4>Shelve.shutdown</h4> +<b>shutdown</b>(<i></i>) +<p> + Public method used to shutdown the shelve interface. +</p> + +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html>
--- a/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.html Sat Nov 30 11:09:02 2024 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,341 +0,0 @@ -<!DOCTYPE html> -<html><head> -<title>eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog</title> -<meta charset="UTF-8"> -<link rel="stylesheet" href="styles.css"> -</head> -<body> -<a NAME="top" ID="top"></a> -<h1>eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog</h1> -<p> -Module implementing Mercurial shelve browser dialog. -</p> - -<h3>Global Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> - -<h3>Classes</h3> -<table> -<tr> -<td><a href="#HgShelveBrowserDialog">HgShelveBrowserDialog</a></td> -<td>Class implementing Mercurial shelve browser dialog.</td> -</tr> -</table> - -<h3>Functions</h3> -<table> -<tr><td>None</td></tr> -</table> - -<hr /> -<hr /> -<a NAME="HgShelveBrowserDialog" ID="HgShelveBrowserDialog"></a> -<h2>HgShelveBrowserDialog</h2> -<p> - Class implementing Mercurial shelve browser dialog. -</p> - -<h3>Derived from</h3> -QWidget, Ui_HgShelveBrowserDialog -<h3>Class Attributes</h3> -<table> -<tr><td>AgeColumn</td></tr> -<tr><td>MessageColumn</td></tr> -<tr><td>NameColumn</td></tr> -</table> - -<h3>Class Methods</h3> -<table> -<tr><td>None</td></tr> -</table> - -<h3>Methods</h3> -<table> -<tr> -<td><a href="#HgShelveBrowserDialog.__init__">HgShelveBrowserDialog</a></td> -<td>Constructor</td> -</tr> -<tr> -<td><a href="#HgShelveBrowserDialog.__cleanupShelves">__cleanupShelves</a></td> -<td>Private slot to delete all shelves.</td> -</tr> -<tr> -<td><a href="#HgShelveBrowserDialog.__deleteShelves">__deleteShelves</a></td> -<td>Private slot to delete the selected shelves.</td> -</tr> -<tr> -<td><a href="#HgShelveBrowserDialog.__finish">__finish</a></td> -<td>Private slot called when the process finished or the user pressed the button.</td> -</tr> -<tr> -<td><a href="#HgShelveBrowserDialog.__generateShelveEntry">__generateShelveEntry</a></td> -<td>Private method to generate the shelve items.</td> -</tr> -<tr> -<td><a href="#HgShelveBrowserDialog.__getShelveEntries">__getShelveEntries</a></td> -<td>Private method to retrieve the list of shelves.</td> -</tr> -<tr> -<td><a href="#HgShelveBrowserDialog.__processBuffer">__processBuffer</a></td> -<td>Private method to process the buffered output of the hg shelve command.</td> -</tr> -<tr> -<td><a href="#HgShelveBrowserDialog.__resetUI">__resetUI</a></td> -<td>Private method to reset the user interface.</td> -</tr> -<tr> -<td><a href="#HgShelveBrowserDialog.__resizeColumnsShelves">__resizeColumnsShelves</a></td> -<td>Private method to resize the shelve list columns.</td> -</tr> -<tr> -<td><a href="#HgShelveBrowserDialog.__showError">__showError</a></td> -<td>Private slot to show some error.</td> -</tr> -<tr> -<td><a href="#HgShelveBrowserDialog.__unshelve">__unshelve</a></td> -<td>Private slot to restore the selected shelve of changes.</td> -</tr> -<tr> -<td><a href="#HgShelveBrowserDialog.closeEvent">closeEvent</a></td> -<td>Protected slot implementing a close event handler.</td> -</tr> -<tr> -<td><a href="#HgShelveBrowserDialog.on_buttonBox_clicked">on_buttonBox_clicked</a></td> -<td>Private slot called by a button of the button box clicked.</td> -</tr> -<tr> -<td><a href="#HgShelveBrowserDialog.on_refreshButton_clicked">on_refreshButton_clicked</a></td> -<td>Private slot to refresh the list of shelves.</td> -</tr> -<tr> -<td><a href="#HgShelveBrowserDialog.on_shelveList_currentItemChanged">on_shelveList_currentItemChanged</a></td> -<td>Private slot called, when the current item of the shelve list changes.</td> -</tr> -<tr> -<td><a href="#HgShelveBrowserDialog.on_shelveList_customContextMenuRequested">on_shelveList_customContextMenuRequested</a></td> -<td>Private slot to show the context menu of the shelve list.</td> -</tr> -<tr> -<td><a href="#HgShelveBrowserDialog.show">show</a></td> -<td>Public slot to show the dialog.</td> -</tr> -<tr> -<td><a href="#HgShelveBrowserDialog.start">start</a></td> -<td>Public slot to start the hg shelve command.</td> -</tr> -</table> - -<h3>Static Methods</h3> -<table> -<tr><td>None</td></tr> -</table> - - -<a NAME="HgShelveBrowserDialog.__init__" ID="HgShelveBrowserDialog.__init__"></a> -<h4>HgShelveBrowserDialog (Constructor)</h4> -<b>HgShelveBrowserDialog</b>(<i>vcs, parent=None</i>) -<p> - Constructor -</p> - -<dl> - -<dt><i>vcs</i> (Hg)</dt> -<dd> -reference to the vcs object -</dd> -<dt><i>parent</i> (QWidget)</dt> -<dd> -parent widget -</dd> -</dl> -<a NAME="HgShelveBrowserDialog.__cleanupShelves" ID="HgShelveBrowserDialog.__cleanupShelves"></a> -<h4>HgShelveBrowserDialog.__cleanupShelves</h4> -<b>__cleanupShelves</b>(<i></i>) -<p> - Private slot to delete all shelves. -</p> - -<a NAME="HgShelveBrowserDialog.__deleteShelves" ID="HgShelveBrowserDialog.__deleteShelves"></a> -<h4>HgShelveBrowserDialog.__deleteShelves</h4> -<b>__deleteShelves</b>(<i></i>) -<p> - Private slot to delete the selected shelves. -</p> - -<a NAME="HgShelveBrowserDialog.__finish" ID="HgShelveBrowserDialog.__finish"></a> -<h4>HgShelveBrowserDialog.__finish</h4> -<b>__finish</b>(<i></i>) -<p> - Private slot called when the process finished or the user pressed - the button. -</p> - -<a NAME="HgShelveBrowserDialog.__generateShelveEntry" ID="HgShelveBrowserDialog.__generateShelveEntry"></a> -<h4>HgShelveBrowserDialog.__generateShelveEntry</h4> -<b>__generateShelveEntry</b>(<i>name, age, message, fileStatistics, totals</i>) -<p> - Private method to generate the shelve items. -</p> - -<dl> - -<dt><i>name</i> (str)</dt> -<dd> -name of the shelve -</dd> -<dt><i>age</i> (str)</dt> -<dd> -age of the shelve -</dd> -<dt><i>message</i> (str)</dt> -<dd> -shelve message -</dd> -<dt><i>fileStatistics</i> (tuple of (str, str, str, str))</dt> -<dd> -per file change statistics (tuple containing the - file name, the number of changes, the number of added lines and the - number of deleted lines) -</dd> -<dt><i>totals</i> (tuple of (str, str, str))</dt> -<dd> -overall statistics (tuple containing the number of changed files, - the number of added lines and the number of deleted lines) -</dd> -</dl> -<a NAME="HgShelveBrowserDialog.__getShelveEntries" ID="HgShelveBrowserDialog.__getShelveEntries"></a> -<h4>HgShelveBrowserDialog.__getShelveEntries</h4> -<b>__getShelveEntries</b>(<i></i>) -<p> - Private method to retrieve the list of shelves. -</p> - -<a NAME="HgShelveBrowserDialog.__processBuffer" ID="HgShelveBrowserDialog.__processBuffer"></a> -<h4>HgShelveBrowserDialog.__processBuffer</h4> -<b>__processBuffer</b>(<i></i>) -<p> - Private method to process the buffered output of the hg shelve command. -</p> - -<a NAME="HgShelveBrowserDialog.__resetUI" ID="HgShelveBrowserDialog.__resetUI"></a> -<h4>HgShelveBrowserDialog.__resetUI</h4> -<b>__resetUI</b>(<i></i>) -<p> - Private method to reset the user interface. -</p> - -<a NAME="HgShelveBrowserDialog.__resizeColumnsShelves" ID="HgShelveBrowserDialog.__resizeColumnsShelves"></a> -<h4>HgShelveBrowserDialog.__resizeColumnsShelves</h4> -<b>__resizeColumnsShelves</b>(<i></i>) -<p> - Private method to resize the shelve list columns. -</p> - -<a NAME="HgShelveBrowserDialog.__showError" ID="HgShelveBrowserDialog.__showError"></a> -<h4>HgShelveBrowserDialog.__showError</h4> -<b>__showError</b>(<i>out</i>) -<p> - Private slot to show some error. -</p> - -<dl> - -<dt><i>out</i> (str)</dt> -<dd> -error to be shown -</dd> -</dl> -<a NAME="HgShelveBrowserDialog.__unshelve" ID="HgShelveBrowserDialog.__unshelve"></a> -<h4>HgShelveBrowserDialog.__unshelve</h4> -<b>__unshelve</b>(<i></i>) -<p> - Private slot to restore the selected shelve of changes. -</p> - -<a NAME="HgShelveBrowserDialog.closeEvent" ID="HgShelveBrowserDialog.closeEvent"></a> -<h4>HgShelveBrowserDialog.closeEvent</h4> -<b>closeEvent</b>(<i>e</i>) -<p> - Protected slot implementing a close event handler. -</p> - -<dl> - -<dt><i>e</i> (QCloseEvent)</dt> -<dd> -close event -</dd> -</dl> -<a NAME="HgShelveBrowserDialog.on_buttonBox_clicked" ID="HgShelveBrowserDialog.on_buttonBox_clicked"></a> -<h4>HgShelveBrowserDialog.on_buttonBox_clicked</h4> -<b>on_buttonBox_clicked</b>(<i>button</i>) -<p> - Private slot called by a button of the button box clicked. -</p> - -<dl> - -<dt><i>button</i> (QAbstractButton)</dt> -<dd> -button that was clicked -</dd> -</dl> -<a NAME="HgShelveBrowserDialog.on_refreshButton_clicked" ID="HgShelveBrowserDialog.on_refreshButton_clicked"></a> -<h4>HgShelveBrowserDialog.on_refreshButton_clicked</h4> -<b>on_refreshButton_clicked</b>(<i></i>) -<p> - Private slot to refresh the list of shelves. -</p> - -<a NAME="HgShelveBrowserDialog.on_shelveList_currentItemChanged" ID="HgShelveBrowserDialog.on_shelveList_currentItemChanged"></a> -<h4>HgShelveBrowserDialog.on_shelveList_currentItemChanged</h4> -<b>on_shelveList_currentItemChanged</b>(<i>current, _previous</i>) -<p> - Private slot called, when the current item of the shelve list changes. -</p> - -<dl> - -<dt><i>current</i> (QTreeWidgetItem)</dt> -<dd> -reference to the new current item -</dd> -<dt><i>_previous</i> (QTreeWidgetItem)</dt> -<dd> -reference to the old current item (unused) -</dd> -</dl> -<a NAME="HgShelveBrowserDialog.on_shelveList_customContextMenuRequested" ID="HgShelveBrowserDialog.on_shelveList_customContextMenuRequested"></a> -<h4>HgShelveBrowserDialog.on_shelveList_customContextMenuRequested</h4> -<b>on_shelveList_customContextMenuRequested</b>(<i>pos</i>) -<p> - Private slot to show the context menu of the shelve list. -</p> - -<dl> - -<dt><i>pos</i> (QPoint)</dt> -<dd> -position of the mouse pointer -</dd> -</dl> -<a NAME="HgShelveBrowserDialog.show" ID="HgShelveBrowserDialog.show"></a> -<h4>HgShelveBrowserDialog.show</h4> -<b>show</b>(<i></i>) -<p> - Public slot to show the dialog. -</p> - -<a NAME="HgShelveBrowserDialog.start" ID="HgShelveBrowserDialog.start"></a> -<h4>HgShelveBrowserDialog.start</h4> -<b>start</b>(<i></i>) -<p> - Public slot to start the hg shelve command. -</p> - -<div align="right"><a href="#top">Up</a></div> -<hr /> -</body></html>
--- a/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveDataDialog.html Sat Nov 30 11:09:02 2024 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,111 +0,0 @@ -<!DOCTYPE html> -<html><head> -<title>eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveDataDialog</title> -<meta charset="UTF-8"> -<link rel="stylesheet" href="styles.css"> -</head> -<body> -<a NAME="top" ID="top"></a> -<h1>eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveDataDialog</h1> -<p> -Module implementing a dialog to enter the data for a shelve operation. -</p> - -<h3>Global Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> - -<h3>Classes</h3> -<table> -<tr> -<td><a href="#HgShelveDataDialog">HgShelveDataDialog</a></td> -<td>Class implementing a dialog to enter the data for a shelve operation.</td> -</tr> -</table> - -<h3>Functions</h3> -<table> -<tr><td>None</td></tr> -</table> - -<hr /> -<hr /> -<a NAME="HgShelveDataDialog" ID="HgShelveDataDialog"></a> -<h2>HgShelveDataDialog</h2> -<p> - Class implementing a dialog to enter the data for a shelve operation. -</p> - -<h3>Derived from</h3> -QDialog, Ui_HgShelveDataDialog -<h3>Class Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> - -<h3>Class Methods</h3> -<table> -<tr><td>None</td></tr> -</table> - -<h3>Methods</h3> -<table> -<tr> -<td><a href="#HgShelveDataDialog.__init__">HgShelveDataDialog</a></td> -<td>Constructor</td> -</tr> -<tr> -<td><a href="#HgShelveDataDialog.getData">getData</a></td> -<td>Public method to get the user data.</td> -</tr> -</table> - -<h3>Static Methods</h3> -<table> -<tr><td>None</td></tr> -</table> - - -<a NAME="HgShelveDataDialog.__init__" ID="HgShelveDataDialog.__init__"></a> -<h4>HgShelveDataDialog (Constructor)</h4> -<b>HgShelveDataDialog</b>(<i>version, parent=None</i>) -<p> - Constructor -</p> - -<dl> - -<dt><i>version</i> (tuple of three int)</dt> -<dd> -Mercurial version -</dd> -<dt><i>parent</i> (QWidget)</dt> -<dd> -reference to the parent widget -</dd> -</dl> -<a NAME="HgShelveDataDialog.getData" ID="HgShelveDataDialog.getData"></a> -<h4>HgShelveDataDialog.getData</h4> -<b>getData</b>(<i></i>) -<p> - Public method to get the user data. -</p> - -<dl> -<dt>Return:</dt> -<dd> -tuple containing the name, date, message, a flag indicating - to add/remove new/missing files and a flag indicating to keep the - shelved changes in the working directory -</dd> -</dl> -<dl> -<dt>Return Type:</dt> -<dd> -tuple of (str, QDateTime, str, bool, bool) -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /> -</body></html>
--- a/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelvesSelectionDialog.html Sat Nov 30 11:09:02 2024 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,124 +0,0 @@ -<!DOCTYPE html> -<html><head> -<title>eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelvesSelectionDialog</title> -<meta charset="UTF-8"> -<link rel="stylesheet" href="styles.css"> -</head> -<body> -<a NAME="top" ID="top"></a> -<h1>eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelvesSelectionDialog</h1> -<p> -Module implementing a dialog to select multiple shelve names. -</p> - -<h3>Global Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> - -<h3>Classes</h3> -<table> -<tr> -<td><a href="#HgShelvesSelectionDialog">HgShelvesSelectionDialog</a></td> -<td>Class implementing a dialog to select multiple shelve names.</td> -</tr> -</table> - -<h3>Functions</h3> -<table> -<tr><td>None</td></tr> -</table> - -<hr /> -<hr /> -<a NAME="HgShelvesSelectionDialog" ID="HgShelvesSelectionDialog"></a> -<h2>HgShelvesSelectionDialog</h2> -<p> - Class implementing a dialog to select multiple shelve names. -</p> - -<h3>Derived from</h3> -QDialog, Ui_HgShelvesSelectionDialog -<h3>Class Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> - -<h3>Class Methods</h3> -<table> -<tr><td>None</td></tr> -</table> - -<h3>Methods</h3> -<table> -<tr> -<td><a href="#HgShelvesSelectionDialog.__init__">HgShelvesSelectionDialog</a></td> -<td>Constructor</td> -</tr> -<tr> -<td><a href="#HgShelvesSelectionDialog.getSelectedShelves">getSelectedShelves</a></td> -<td>Public method to retrieve the selected shelve names.</td> -</tr> -<tr> -<td><a href="#HgShelvesSelectionDialog.on_shelvesList_itemSelectionChanged">on_shelvesList_itemSelectionChanged</a></td> -<td>Private slot to enabled the OK button if items have been selected.</td> -</tr> -</table> - -<h3>Static Methods</h3> -<table> -<tr><td>None</td></tr> -</table> - - -<a NAME="HgShelvesSelectionDialog.__init__" ID="HgShelvesSelectionDialog.__init__"></a> -<h4>HgShelvesSelectionDialog (Constructor)</h4> -<b>HgShelvesSelectionDialog</b>(<i>message, shelveNames, parent=None</i>) -<p> - Constructor -</p> - -<dl> - -<dt><i>message</i> (str)</dt> -<dd> -message to be shown -</dd> -<dt><i>shelveNames</i> (list of str)</dt> -<dd> -list of shelve names -</dd> -<dt><i>parent</i> (QWidget)</dt> -<dd> -reference to the parent widget -</dd> -</dl> -<a NAME="HgShelvesSelectionDialog.getSelectedShelves" ID="HgShelvesSelectionDialog.getSelectedShelves"></a> -<h4>HgShelvesSelectionDialog.getSelectedShelves</h4> -<b>getSelectedShelves</b>(<i></i>) -<p> - Public method to retrieve the selected shelve names. -</p> - -<dl> -<dt>Return:</dt> -<dd> -selected shelve names -</dd> -</dl> -<dl> -<dt>Return Type:</dt> -<dd> -list of str -</dd> -</dl> -<a NAME="HgShelvesSelectionDialog.on_shelvesList_itemSelectionChanged" ID="HgShelvesSelectionDialog.on_shelvesList_itemSelectionChanged"></a> -<h4>HgShelvesSelectionDialog.on_shelvesList_itemSelectionChanged</h4> -<b>on_shelvesList_itemSelectionChanged</b>(<i></i>) -<p> - Private slot to enabled the OK button if items have been selected. -</p> - -<div align="right"><a href="#top">Up</a></div> -<hr /> -</body></html>
--- a/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgUnshelveDataDialog.html Sat Nov 30 11:09:02 2024 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,114 +0,0 @@ -<!DOCTYPE html> -<html><head> -<title>eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgUnshelveDataDialog</title> -<meta charset="UTF-8"> -<link rel="stylesheet" href="styles.css"> -</head> -<body> -<a NAME="top" ID="top"></a> -<h1>eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgUnshelveDataDialog</h1> -<p> -Module implementing a dialog to enter the data for an unshelve operation. -</p> - -<h3>Global Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> - -<h3>Classes</h3> -<table> -<tr> -<td><a href="#HgUnshelveDataDialog">HgUnshelveDataDialog</a></td> -<td>Class implementing a dialog to enter the data for an unshelve operation.</td> -</tr> -</table> - -<h3>Functions</h3> -<table> -<tr><td>None</td></tr> -</table> - -<hr /> -<hr /> -<a NAME="HgUnshelveDataDialog" ID="HgUnshelveDataDialog"></a> -<h2>HgUnshelveDataDialog</h2> -<p> - Class implementing a dialog to enter the data for an unshelve operation. -</p> - -<h3>Derived from</h3> -QDialog, Ui_HgUnshelveDataDialog -<h3>Class Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> - -<h3>Class Methods</h3> -<table> -<tr><td>None</td></tr> -</table> - -<h3>Methods</h3> -<table> -<tr> -<td><a href="#HgUnshelveDataDialog.__init__">HgUnshelveDataDialog</a></td> -<td>Constructor</td> -</tr> -<tr> -<td><a href="#HgUnshelveDataDialog.getData">getData</a></td> -<td>Public method to get the user data.</td> -</tr> -</table> - -<h3>Static Methods</h3> -<table> -<tr><td>None</td></tr> -</table> - - -<a NAME="HgUnshelveDataDialog.__init__" ID="HgUnshelveDataDialog.__init__"></a> -<h4>HgUnshelveDataDialog (Constructor)</h4> -<b>HgUnshelveDataDialog</b>(<i>shelveNames, shelveName="", parent=None</i>) -<p> - Constructor -</p> - -<dl> - -<dt><i>shelveNames</i> (list of str)</dt> -<dd> -list of available shelves -</dd> -<dt><i>shelveName</i> (str)</dt> -<dd> -name of the shelve to restore -</dd> -<dt><i>parent</i> (QWidget)</dt> -<dd> -reference to the parent widget -</dd> -</dl> -<a NAME="HgUnshelveDataDialog.getData" ID="HgUnshelveDataDialog.getData"></a> -<h4>HgUnshelveDataDialog.getData</h4> -<b>getData</b>(<i></i>) -<p> - Public method to get the user data. -</p> - -<dl> -<dt>Return:</dt> -<dd> -tuple containing the name and a flag indicating to keep the - shelved change -</dd> -</dl> -<dl> -<dt>Return Type:</dt> -<dd> -tuple of (str, bool) -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /> -</body></html>
--- a/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectBrowserHelper.html Sat Nov 30 11:09:02 2024 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,195 +0,0 @@ -<!DOCTYPE html> -<html><head> -<title>eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectBrowserHelper</title> -<meta charset="UTF-8"> -<link rel="stylesheet" href="styles.css"> -</head> -<body> -<a NAME="top" ID="top"></a> -<h1>eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectBrowserHelper</h1> -<p> -Module implementing the shelve extension project browser helper. -</p> - -<h3>Global Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> - -<h3>Classes</h3> -<table> -<tr> -<td><a href="#ShelveProjectBrowserHelper">ShelveProjectBrowserHelper</a></td> -<td>Class implementing the shelve extension project browser helper.</td> -</tr> -</table> - -<h3>Functions</h3> -<table> -<tr><td>None</td></tr> -</table> - -<hr /> -<hr /> -<a NAME="ShelveProjectBrowserHelper" ID="ShelveProjectBrowserHelper"></a> -<h2>ShelveProjectBrowserHelper</h2> -<p> - Class implementing the shelve extension project browser helper. -</p> - -<h3>Derived from</h3> -HgExtensionProjectBrowserHelper -<h3>Class Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> - -<h3>Class Methods</h3> -<table> -<tr><td>None</td></tr> -</table> - -<h3>Methods</h3> -<table> -<tr> -<td><a href="#ShelveProjectBrowserHelper.__init__">ShelveProjectBrowserHelper</a></td> -<td>Constructor</td> -</tr> -<tr> -<td><a href="#ShelveProjectBrowserHelper.__hgShelve">__hgShelve</a></td> -<td>Private slot used to shelve all current changes.</td> -</tr> -<tr> -<td><a href="#ShelveProjectBrowserHelper.__reopenProject">__reopenProject</a></td> -<td>Private method to reopen the project if needed and wanted.</td> -</tr> -<tr> -<td><a href="#ShelveProjectBrowserHelper.initMenus">initMenus</a></td> -<td>Public method to generate the extension menus.</td> -</tr> -<tr> -<td><a href="#ShelveProjectBrowserHelper.menuTitle">menuTitle</a></td> -<td>Public method to get the menu title.</td> -</tr> -<tr> -<td><a href="#ShelveProjectBrowserHelper.showExtensionMenu">showExtensionMenu</a></td> -<td>Public method to prepare the extension menu for display.</td> -</tr> -</table> - -<h3>Static Methods</h3> -<table> -<tr><td>None</td></tr> -</table> - - -<a NAME="ShelveProjectBrowserHelper.__init__" ID="ShelveProjectBrowserHelper.__init__"></a> -<h4>ShelveProjectBrowserHelper (Constructor)</h4> -<b>ShelveProjectBrowserHelper</b>(<i>vcsObject, browserObject, projectObject</i>) -<p> - Constructor -</p> - -<dl> - -<dt><i>vcsObject</i> (Hg)</dt> -<dd> -reference to the vcs object -</dd> -<dt><i>browserObject</i> (ProjectBaseBrowser)</dt> -<dd> -reference to the project browser object -</dd> -<dt><i>projectObject</i> (Project)</dt> -<dd> -reference to the project object -</dd> -</dl> -<a NAME="ShelveProjectBrowserHelper.__hgShelve" ID="ShelveProjectBrowserHelper.__hgShelve"></a> -<h4>ShelveProjectBrowserHelper.__hgShelve</h4> -<b>__hgShelve</b>(<i></i>) -<p> - Private slot used to shelve all current changes. -</p> - -<a NAME="ShelveProjectBrowserHelper.__reopenProject" ID="ShelveProjectBrowserHelper.__reopenProject"></a> -<h4>ShelveProjectBrowserHelper.__reopenProject</h4> -<b>__reopenProject</b>(<i>shouldReopen, title</i>) -<p> - Private method to reopen the project if needed and wanted. -</p> - -<dl> - -<dt><i>shouldReopen</i> (bool)</dt> -<dd> -flag indicating that the project should - be reopened -</dd> -<dt><i>title</i> (str)</dt> -<dd> -title of the message box -</dd> -</dl> -<a NAME="ShelveProjectBrowserHelper.initMenus" ID="ShelveProjectBrowserHelper.initMenus"></a> -<h4>ShelveProjectBrowserHelper.initMenus</h4> -<b>initMenus</b>(<i></i>) -<p> - Public method to generate the extension menus. -</p> - -<dl> -<dt>Return:</dt> -<dd> -dictionary of populated menu. The dict must have the keys 'mainMenu', - 'multiMenu', 'backMenu', 'dirMenu' and 'dirMultiMenu'. -</dd> -</dl> -<dl> -<dt>Return Type:</dt> -<dd> -dict of QMenu -</dd> -</dl> -<a NAME="ShelveProjectBrowserHelper.menuTitle" ID="ShelveProjectBrowserHelper.menuTitle"></a> -<h4>ShelveProjectBrowserHelper.menuTitle</h4> -<b>menuTitle</b>(<i></i>) -<p> - Public method to get the menu title. -</p> - -<dl> -<dt>Return:</dt> -<dd> -title of the menu -</dd> -</dl> -<dl> -<dt>Return Type:</dt> -<dd> -str -</dd> -</dl> -<a NAME="ShelveProjectBrowserHelper.showExtensionMenu" ID="ShelveProjectBrowserHelper.showExtensionMenu"></a> -<h4>ShelveProjectBrowserHelper.showExtensionMenu</h4> -<b>showExtensionMenu</b>(<i>key, controlled</i>) -<p> - Public method to prepare the extension menu for display. -</p> - -<dl> - -<dt><i>key</i> (str)</dt> -<dd> -menu key (one of 'mainMenu', 'multiMenu', 'backMenu', 'dirMenu' - or 'dirMultiMenu') -</dd> -<dt><i>controlled</i> (bool)</dt> -<dd> -flag indicating to prepare the menu for a - version controlled entry or a non-version controlled entry -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /> -</body></html>
--- a/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectHelper.html Sat Nov 30 11:09:02 2024 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,239 +0,0 @@ -<!DOCTYPE html> -<html><head> -<title>eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectHelper</title> -<meta charset="UTF-8"> -<link rel="stylesheet" href="styles.css"> -</head> -<body> -<a NAME="top" ID="top"></a> -<h1>eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectHelper</h1> -<p> -Module implementing the shelve extension project helper. -</p> - -<h3>Global Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> - -<h3>Classes</h3> -<table> -<tr> -<td><a href="#ShelveProjectHelper">ShelveProjectHelper</a></td> -<td>Class implementing the shelve extension project helper.</td> -</tr> -</table> - -<h3>Functions</h3> -<table> -<tr><td>None</td></tr> -</table> - -<hr /> -<hr /> -<a NAME="ShelveProjectHelper" ID="ShelveProjectHelper"></a> -<h2>ShelveProjectHelper</h2> -<p> - Class implementing the shelve extension project helper. -</p> - -<h3>Derived from</h3> -HgExtensionProjectHelper -<h3>Class Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> - -<h3>Class Methods</h3> -<table> -<tr><td>None</td></tr> -</table> - -<h3>Methods</h3> -<table> -<tr> -<td><a href="#ShelveProjectHelper.__init__">ShelveProjectHelper</a></td> -<td>Constructor</td> -</tr> -<tr> -<td><a href="#ShelveProjectHelper.__hgCleanupShelves">__hgCleanupShelves</a></td> -<td>Private slot to delete all shelves.</td> -</tr> -<tr> -<td><a href="#ShelveProjectHelper.__hgDeleteShelves">__hgDeleteShelves</a></td> -<td>Private slot to delete selected shelves.</td> -</tr> -<tr> -<td><a href="#ShelveProjectHelper.__hgShelve">__hgShelve</a></td> -<td>Private slot used to shelve all current changes.</td> -</tr> -<tr> -<td><a href="#ShelveProjectHelper.__hgShelveBrowser">__hgShelveBrowser</a></td> -<td>Private slot to show the shelve browser dialog.</td> -</tr> -<tr> -<td><a href="#ShelveProjectHelper.__hgUnshelve">__hgUnshelve</a></td> -<td>Private slot used to restore a shelved change.</td> -</tr> -<tr> -<td><a href="#ShelveProjectHelper.__hgUnshelveAbort">__hgUnshelveAbort</a></td> -<td>Private slot used to abort an ongoing restore operation.</td> -</tr> -<tr> -<td><a href="#ShelveProjectHelper.__hgUnshelveContinue">__hgUnshelveContinue</a></td> -<td>Private slot used to continue an ongoing restore operation.</td> -</tr> -<tr> -<td><a href="#ShelveProjectHelper.__reopenProject">__reopenProject</a></td> -<td>Private method to reopen the project if needed and wanted.</td> -</tr> -<tr> -<td><a href="#ShelveProjectHelper.initActions">initActions</a></td> -<td>Public method to generate the action objects.</td> -</tr> -<tr> -<td><a href="#ShelveProjectHelper.initMenu">initMenu</a></td> -<td>Public method to generate the extension menu.</td> -</tr> -<tr> -<td><a href="#ShelveProjectHelper.menuTitle">menuTitle</a></td> -<td>Public method to get the menu title.</td> -</tr> -</table> - -<h3>Static Methods</h3> -<table> -<tr><td>None</td></tr> -</table> - - -<a NAME="ShelveProjectHelper.__init__" ID="ShelveProjectHelper.__init__"></a> -<h4>ShelveProjectHelper (Constructor)</h4> -<b>ShelveProjectHelper</b>(<i></i>) -<p> - Constructor -</p> - -<a NAME="ShelveProjectHelper.__hgCleanupShelves" ID="ShelveProjectHelper.__hgCleanupShelves"></a> -<h4>ShelveProjectHelper.__hgCleanupShelves</h4> -<b>__hgCleanupShelves</b>(<i></i>) -<p> - Private slot to delete all shelves. -</p> - -<a NAME="ShelveProjectHelper.__hgDeleteShelves" ID="ShelveProjectHelper.__hgDeleteShelves"></a> -<h4>ShelveProjectHelper.__hgDeleteShelves</h4> -<b>__hgDeleteShelves</b>(<i></i>) -<p> - Private slot to delete selected shelves. -</p> - -<a NAME="ShelveProjectHelper.__hgShelve" ID="ShelveProjectHelper.__hgShelve"></a> -<h4>ShelveProjectHelper.__hgShelve</h4> -<b>__hgShelve</b>(<i></i>) -<p> - Private slot used to shelve all current changes. -</p> - -<a NAME="ShelveProjectHelper.__hgShelveBrowser" ID="ShelveProjectHelper.__hgShelveBrowser"></a> -<h4>ShelveProjectHelper.__hgShelveBrowser</h4> -<b>__hgShelveBrowser</b>(<i></i>) -<p> - Private slot to show the shelve browser dialog. -</p> - -<a NAME="ShelveProjectHelper.__hgUnshelve" ID="ShelveProjectHelper.__hgUnshelve"></a> -<h4>ShelveProjectHelper.__hgUnshelve</h4> -<b>__hgUnshelve</b>(<i></i>) -<p> - Private slot used to restore a shelved change. -</p> - -<a NAME="ShelveProjectHelper.__hgUnshelveAbort" ID="ShelveProjectHelper.__hgUnshelveAbort"></a> -<h4>ShelveProjectHelper.__hgUnshelveAbort</h4> -<b>__hgUnshelveAbort</b>(<i></i>) -<p> - Private slot used to abort an ongoing restore operation. -</p> - -<a NAME="ShelveProjectHelper.__hgUnshelveContinue" ID="ShelveProjectHelper.__hgUnshelveContinue"></a> -<h4>ShelveProjectHelper.__hgUnshelveContinue</h4> -<b>__hgUnshelveContinue</b>(<i></i>) -<p> - Private slot used to continue an ongoing restore operation. -</p> - -<a NAME="ShelveProjectHelper.__reopenProject" ID="ShelveProjectHelper.__reopenProject"></a> -<h4>ShelveProjectHelper.__reopenProject</h4> -<b>__reopenProject</b>(<i>shouldReopen, title</i>) -<p> - Private method to reopen the project if needed and wanted. -</p> - -<dl> - -<dt><i>shouldReopen</i> (bool)</dt> -<dd> -flag indicating that the project should - be reopened -</dd> -<dt><i>title</i> (str)</dt> -<dd> -title of the message box -</dd> -</dl> -<a NAME="ShelveProjectHelper.initActions" ID="ShelveProjectHelper.initActions"></a> -<h4>ShelveProjectHelper.initActions</h4> -<b>initActions</b>(<i></i>) -<p> - Public method to generate the action objects. -</p> - -<a NAME="ShelveProjectHelper.initMenu" ID="ShelveProjectHelper.initMenu"></a> -<h4>ShelveProjectHelper.initMenu</h4> -<b>initMenu</b>(<i>mainMenu</i>) -<p> - Public method to generate the extension menu. -</p> - -<dl> - -<dt><i>mainMenu</i> (QMenu)</dt> -<dd> -reference to the main menu -</dd> -</dl> -<dl> -<dt>Return:</dt> -<dd> -populated menu -</dd> -</dl> -<dl> -<dt>Return Type:</dt> -<dd> -QMenu -</dd> -</dl> -<a NAME="ShelveProjectHelper.menuTitle" ID="ShelveProjectHelper.menuTitle"></a> -<h4>ShelveProjectHelper.menuTitle</h4> -<b>menuTitle</b>(<i></i>) -<p> - Public method to get the menu title. -</p> - -<dl> -<dt>Return:</dt> -<dd> -title of the menu -</dd> -</dl> -<dl> -<dt>Return Type:</dt> -<dd> -str -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /> -</body></html>
--- a/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.shelve.html Sat Nov 30 11:09:02 2024 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,267 +0,0 @@ -<!DOCTYPE html> -<html><head> -<title>eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.shelve</title> -<meta charset="UTF-8"> -<link rel="stylesheet" href="styles.css"> -</head> -<body> -<a NAME="top" ID="top"></a> -<h1>eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.shelve</h1> -<p> -Module implementing the shelve extension interface. -</p> - -<h3>Global Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> - -<h3>Classes</h3> -<table> -<tr> -<td><a href="#Shelve">Shelve</a></td> -<td>Class implementing the shelve extension interface.</td> -</tr> -</table> - -<h3>Functions</h3> -<table> -<tr><td>None</td></tr> -</table> - -<hr /> -<hr /> -<a NAME="Shelve" ID="Shelve"></a> -<h2>Shelve</h2> -<p> - Class implementing the shelve extension interface. -</p> - -<h3>Derived from</h3> -HgExtension -<h3>Class Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> - -<h3>Class Methods</h3> -<table> -<tr><td>None</td></tr> -</table> - -<h3>Methods</h3> -<table> -<tr> -<td><a href="#Shelve.__init__">Shelve</a></td> -<td>Constructor</td> -</tr> -<tr> -<td><a href="#Shelve.__hgGetShelveNamesList">__hgGetShelveNamesList</a></td> -<td>Private method to get the list of shelved changes.</td> -</tr> -<tr> -<td><a href="#Shelve.hgCleanupShelves">hgCleanupShelves</a></td> -<td>Public method to delete all shelves.</td> -</tr> -<tr> -<td><a href="#Shelve.hgDeleteShelves">hgDeleteShelves</a></td> -<td>Public method to delete named shelves.</td> -</tr> -<tr> -<td><a href="#Shelve.hgShelve">hgShelve</a></td> -<td>Public method to shelve current changes of files or directories.</td> -</tr> -<tr> -<td><a href="#Shelve.hgShelveBrowser">hgShelveBrowser</a></td> -<td>Public method to show the shelve browser dialog.</td> -</tr> -<tr> -<td><a href="#Shelve.hgUnshelve">hgUnshelve</a></td> -<td>Public method to restore shelved changes to the project directory.</td> -</tr> -<tr> -<td><a href="#Shelve.hgUnshelveAbort">hgUnshelveAbort</a></td> -<td>Public method to abort the ongoing restore operation.</td> -</tr> -<tr> -<td><a href="#Shelve.hgUnshelveContinue">hgUnshelveContinue</a></td> -<td>Public method to continue the ongoing restore operation.</td> -</tr> -<tr> -<td><a href="#Shelve.shutdown">shutdown</a></td> -<td>Public method used to shutdown the shelve interface.</td> -</tr> -</table> - -<h3>Static Methods</h3> -<table> -<tr><td>None</td></tr> -</table> - - -<a NAME="Shelve.__init__" ID="Shelve.__init__"></a> -<h4>Shelve (Constructor)</h4> -<b>Shelve</b>(<i>vcs, ui=None</i>) -<p> - Constructor -</p> - -<dl> - -<dt><i>vcs</i> (Hg)</dt> -<dd> -reference to the Mercurial vcs object -</dd> -<dt><i>ui</i> (QWidget)</dt> -<dd> -reference to a UI widget (defaults to None) -</dd> -</dl> -<a NAME="Shelve.__hgGetShelveNamesList" ID="Shelve.__hgGetShelveNamesList"></a> -<h4>Shelve.__hgGetShelveNamesList</h4> -<b>__hgGetShelveNamesList</b>(<i></i>) -<p> - Private method to get the list of shelved changes. -</p> - -<dl> -<dt>Return:</dt> -<dd> -list of shelved changes -</dd> -</dl> -<dl> -<dt>Return Type:</dt> -<dd> -list of str -</dd> -</dl> -<a NAME="Shelve.hgCleanupShelves" ID="Shelve.hgCleanupShelves"></a> -<h4>Shelve.hgCleanupShelves</h4> -<b>hgCleanupShelves</b>(<i></i>) -<p> - Public method to delete all shelves. -</p> - -<a NAME="Shelve.hgDeleteShelves" ID="Shelve.hgDeleteShelves"></a> -<h4>Shelve.hgDeleteShelves</h4> -<b>hgDeleteShelves</b>(<i>shelveNames=None</i>) -<p> - Public method to delete named shelves. -</p> - -<dl> - -<dt><i>shelveNames</i> (list of str)</dt> -<dd> -name of shelves to delete -</dd> -</dl> -<a NAME="Shelve.hgShelve" ID="Shelve.hgShelve"></a> -<h4>Shelve.hgShelve</h4> -<b>hgShelve</b>(<i>name</i>) -<p> - Public method to shelve current changes of files or directories. -</p> - -<dl> - -<dt><i>name</i> (list of str)</dt> -<dd> -directory or file name (string) or list of directory - or file names -</dd> -</dl> -<dl> -<dt>Return:</dt> -<dd> -flag indicating that the project should be reread -</dd> -</dl> -<dl> -<dt>Return Type:</dt> -<dd> -bool -</dd> -</dl> -<a NAME="Shelve.hgShelveBrowser" ID="Shelve.hgShelveBrowser"></a> -<h4>Shelve.hgShelveBrowser</h4> -<b>hgShelveBrowser</b>(<i></i>) -<p> - Public method to show the shelve browser dialog. -</p> - -<a NAME="Shelve.hgUnshelve" ID="Shelve.hgUnshelve"></a> -<h4>Shelve.hgUnshelve</h4> -<b>hgUnshelve</b>(<i>shelveName=""</i>) -<p> - Public method to restore shelved changes to the project directory. -</p> - -<dl> - -<dt><i>shelveName</i> (str)</dt> -<dd> -name of the shelve to restore -</dd> -</dl> -<dl> -<dt>Return:</dt> -<dd> -flag indicating that the project should be reread -</dd> -</dl> -<dl> -<dt>Return Type:</dt> -<dd> -bool -</dd> -</dl> -<a NAME="Shelve.hgUnshelveAbort" ID="Shelve.hgUnshelveAbort"></a> -<h4>Shelve.hgUnshelveAbort</h4> -<b>hgUnshelveAbort</b>(<i></i>) -<p> - Public method to abort the ongoing restore operation. -</p> - -<dl> -<dt>Return:</dt> -<dd> -flag indicating that the project should be reread -</dd> -</dl> -<dl> -<dt>Return Type:</dt> -<dd> -bool -</dd> -</dl> -<a NAME="Shelve.hgUnshelveContinue" ID="Shelve.hgUnshelveContinue"></a> -<h4>Shelve.hgUnshelveContinue</h4> -<b>hgUnshelveContinue</b>(<i></i>) -<p> - Public method to continue the ongoing restore operation. -</p> - -<dl> -<dt>Return:</dt> -<dd> -flag indicating that the project should be reread -</dd> -</dl> -<dl> -<dt>Return Type:</dt> -<dd> -bool -</dd> -</dl> -<a NAME="Shelve.shutdown" ID="Shelve.shutdown"></a> -<h4>Shelve.shutdown</h4> -<b>shutdown</b>(<i></i>) -<p> - Public method used to shutdown the shelve interface. -</p> - -<div align="right"><a href="#top">Up</a></div> -<hr /> -</body></html>
--- a/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.HgStripDialog.html Sat Nov 30 11:09:02 2024 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,158 +0,0 @@ -<!DOCTYPE html> -<html><head> -<title>eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.HgStripDialog</title> -<meta charset="UTF-8"> -<link rel="stylesheet" href="styles.css"> -</head> -<body> -<a NAME="top" ID="top"></a> -<h1>eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.HgStripDialog</h1> -<p> -Module implementing a dialog to enter the data to strip changesets. -</p> - -<h3>Global Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> - -<h3>Classes</h3> -<table> -<tr> -<td><a href="#HgStripDialog">HgStripDialog</a></td> -<td>Class implementing a dialog to enter the data to strip changesets.</td> -</tr> -</table> - -<h3>Functions</h3> -<table> -<tr><td>None</td></tr> -</table> - -<hr /> -<hr /> -<a NAME="HgStripDialog" ID="HgStripDialog"></a> -<h2>HgStripDialog</h2> -<p> - Class implementing a dialog to enter the data to strip changesets. -</p> - -<h3>Derived from</h3> -QDialog, Ui_HgStripDialog -<h3>Class Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> - -<h3>Class Methods</h3> -<table> -<tr><td>None</td></tr> -</table> - -<h3>Methods</h3> -<table> -<tr> -<td><a href="#HgStripDialog.__init__">HgStripDialog</a></td> -<td>Constructor</td> -</tr> -<tr> -<td><a href="#HgStripDialog.__getRevision">__getRevision</a></td> -<td>Private method to generate the revision.</td> -</tr> -<tr> -<td><a href="#HgStripDialog.__updateOK">__updateOK</a></td> -<td>Private slot to update the OK button.</td> -</tr> -<tr> -<td><a href="#HgStripDialog.getData">getData</a></td> -<td>Public method to retrieve the data for the strip action.</td> -</tr> -</table> - -<h3>Static Methods</h3> -<table> -<tr><td>None</td></tr> -</table> - - -<a NAME="HgStripDialog.__init__" ID="HgStripDialog.__init__"></a> -<h4>HgStripDialog (Constructor)</h4> -<b>HgStripDialog</b>(<i>tagsList, branchesList, bookmarksList=None, rev="", parent=None</i>) -<p> - Constructor -</p> - -<dl> - -<dt><i>tagsList</i> (list of str)</dt> -<dd> -list of tags -</dd> -<dt><i>branchesList</i> (list of str)</dt> -<dd> -list of branches -</dd> -<dt><i>bookmarksList</i> (list of str)</dt> -<dd> -list of bookmarks -</dd> -<dt><i>rev</i> (str)</dt> -<dd> -revision to strip from -</dd> -<dt><i>parent</i> (QWidget)</dt> -<dd> -reference to the parent widget -</dd> -</dl> -<a NAME="HgStripDialog.__getRevision" ID="HgStripDialog.__getRevision"></a> -<h4>HgStripDialog.__getRevision</h4> -<b>__getRevision</b>(<i></i>) -<p> - Private method to generate the revision. -</p> - -<dl> -<dt>Return:</dt> -<dd> -revision -</dd> -</dl> -<dl> -<dt>Return Type:</dt> -<dd> -str -</dd> -</dl> -<a NAME="HgStripDialog.__updateOK" ID="HgStripDialog.__updateOK"></a> -<h4>HgStripDialog.__updateOK</h4> -<b>__updateOK</b>(<i></i>) -<p> - Private slot to update the OK button. -</p> - -<a NAME="HgStripDialog.getData" ID="HgStripDialog.getData"></a> -<h4>HgStripDialog.getData</h4> -<b>getData</b>(<i></i>) -<p> - Public method to retrieve the data for the strip action. -</p> - -<dl> -<dt>Return:</dt> -<dd> -tuple with the revision, a bookmark name, a flag indicating - to enforce the strip action, a flag indicating to omit the creation - of backup bundles and a flag indicating to not modify the working - directory -</dd> -</dl> -<dl> -<dt>Return Type:</dt> -<dd> -tuple (str, str, bool, bool, bool) -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /> -</body></html>
--- a/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.ProjectHelper.html Sat Nov 30 11:09:02 2024 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,150 +0,0 @@ -<!DOCTYPE html> -<html><head> -<title>eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.ProjectHelper</title> -<meta charset="UTF-8"> -<link rel="stylesheet" href="styles.css"> -</head> -<body> -<a NAME="top" ID="top"></a> -<h1>eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.ProjectHelper</h1> -<p> -Module implementing the strip extension project helper. -</p> - -<h3>Global Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> - -<h3>Classes</h3> -<table> -<tr> -<td><a href="#StripProjectHelper">StripProjectHelper</a></td> -<td>Class implementing the strip extension project helper.</td> -</tr> -</table> - -<h3>Functions</h3> -<table> -<tr><td>None</td></tr> -</table> - -<hr /> -<hr /> -<a NAME="StripProjectHelper" ID="StripProjectHelper"></a> -<h2>StripProjectHelper</h2> -<p> - Class implementing the strip extension project helper. -</p> - -<h3>Derived from</h3> -HgExtensionProjectHelper -<h3>Class Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> - -<h3>Class Methods</h3> -<table> -<tr><td>None</td></tr> -</table> - -<h3>Methods</h3> -<table> -<tr> -<td><a href="#StripProjectHelper.__init__">StripProjectHelper</a></td> -<td>Constructor</td> -</tr> -<tr> -<td><a href="#StripProjectHelper.__hgStrip">__hgStrip</a></td> -<td>Private slot used to strip revisions from a repository.</td> -</tr> -<tr> -<td><a href="#StripProjectHelper.initActions">initActions</a></td> -<td>Public method to generate the action objects.</td> -</tr> -<tr> -<td><a href="#StripProjectHelper.initMenu">initMenu</a></td> -<td>Public method to generate the extension menu.</td> -</tr> -<tr> -<td><a href="#StripProjectHelper.menuTitle">menuTitle</a></td> -<td>Public method to get the menu title.</td> -</tr> -</table> - -<h3>Static Methods</h3> -<table> -<tr><td>None</td></tr> -</table> - - -<a NAME="StripProjectHelper.__init__" ID="StripProjectHelper.__init__"></a> -<h4>StripProjectHelper (Constructor)</h4> -<b>StripProjectHelper</b>(<i></i>) -<p> - Constructor -</p> - -<a NAME="StripProjectHelper.__hgStrip" ID="StripProjectHelper.__hgStrip"></a> -<h4>StripProjectHelper.__hgStrip</h4> -<b>__hgStrip</b>(<i></i>) -<p> - Private slot used to strip revisions from a repository. -</p> - -<a NAME="StripProjectHelper.initActions" ID="StripProjectHelper.initActions"></a> -<h4>StripProjectHelper.initActions</h4> -<b>initActions</b>(<i></i>) -<p> - Public method to generate the action objects. -</p> - -<a NAME="StripProjectHelper.initMenu" ID="StripProjectHelper.initMenu"></a> -<h4>StripProjectHelper.initMenu</h4> -<b>initMenu</b>(<i>mainMenu</i>) -<p> - Public method to generate the extension menu. -</p> - -<dl> - -<dt><i>mainMenu</i> (QMenu)</dt> -<dd> -reference to the main menu -</dd> -</dl> -<dl> -<dt>Return:</dt> -<dd> -populated menu -</dd> -</dl> -<dl> -<dt>Return Type:</dt> -<dd> -QMenu -</dd> -</dl> -<a NAME="StripProjectHelper.menuTitle" ID="StripProjectHelper.menuTitle"></a> -<h4>StripProjectHelper.menuTitle</h4> -<b>menuTitle</b>(<i></i>) -<p> - Public method to get the menu title. -</p> - -<dl> -<dt>Return:</dt> -<dd> -title of the menu -</dd> -</dl> -<dl> -<dt>Return Type:</dt> -<dd> -str -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /> -</body></html>
--- a/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.strip.html Sat Nov 30 11:09:02 2024 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,116 +0,0 @@ -<!DOCTYPE html> -<html><head> -<title>eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.strip</title> -<meta charset="UTF-8"> -<link rel="stylesheet" href="styles.css"> -</head> -<body> -<a NAME="top" ID="top"></a> -<h1>eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.strip</h1> -<p> -Module implementing the strip extension interface. -</p> - -<h3>Global Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> - -<h3>Classes</h3> -<table> -<tr> -<td><a href="#Strip">Strip</a></td> -<td>Class implementing the strip extension interface.</td> -</tr> -</table> - -<h3>Functions</h3> -<table> -<tr><td>None</td></tr> -</table> - -<hr /> -<hr /> -<a NAME="Strip" ID="Strip"></a> -<h2>Strip</h2> -<p> - Class implementing the strip extension interface. -</p> - -<h3>Derived from</h3> -HgExtension -<h3>Class Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> - -<h3>Class Methods</h3> -<table> -<tr><td>None</td></tr> -</table> - -<h3>Methods</h3> -<table> -<tr> -<td><a href="#Strip.__init__">Strip</a></td> -<td>Constructor</td> -</tr> -<tr> -<td><a href="#Strip.hgStrip">hgStrip</a></td> -<td>Public method to strip revisions from a repository.</td> -</tr> -</table> - -<h3>Static Methods</h3> -<table> -<tr><td>None</td></tr> -</table> - - -<a NAME="Strip.__init__" ID="Strip.__init__"></a> -<h4>Strip (Constructor)</h4> -<b>Strip</b>(<i>vcs, ui=None</i>) -<p> - Constructor -</p> - -<dl> - -<dt><i>vcs</i> (Hg)</dt> -<dd> -reference to the Mercurial vcs object -</dd> -<dt><i>ui</i> (QWidget)</dt> -<dd> -reference to a UI widget (defaults to None) -</dd> -</dl> -<a NAME="Strip.hgStrip" ID="Strip.hgStrip"></a> -<h4>Strip.hgStrip</h4> -<b>hgStrip</b>(<i>rev=""</i>) -<p> - Public method to strip revisions from a repository. -</p> - -<dl> - -<dt><i>rev</i> (str)</dt> -<dd> -revision to strip from -</dd> -</dl> -<dl> -<dt>Return:</dt> -<dd> -flag indicating that the project should be reread -</dd> -</dl> -<dl> -<dt>Return Type:</dt> -<dd> -bool -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /> -</body></html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.HgUncommitDialog.html Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,130 @@ +<!DOCTYPE html> +<html><head> +<title>eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.HgUncommitDialog</title> +<meta charset="UTF-8"> +<link rel="stylesheet" href="styles.css"> +</head> +<body> +<a NAME="top" ID="top"></a> +<h1>eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.HgUncommitDialog</h1> +<p> +Module implementing a dialog to enter the uncommit data. +</p> + +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Classes</h3> +<table> +<tr> +<td><a href="#HgUncommitDialog">HgUncommitDialog</a></td> +<td>Class implementing a dialog to enter the uncommit data.</td> +</tr> +</table> + +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> + +<hr /> +<hr /> +<a NAME="HgUncommitDialog" ID="HgUncommitDialog"></a> +<h2>HgUncommitDialog</h2> +<p> + Class implementing a dialog to enter the uncommit data. +</p> + +<h3>Derived from</h3> +QDialog, Ui_HgUncommitDialog +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Methods</h3> +<table> +<tr> +<td><a href="#HgUncommitDialog.__init__">HgUncommitDialog</a></td> +<td>Constructor</td> +</tr> +<tr> +<td><a href="#HgUncommitDialog.getUncommitData">getUncommitData</a></td> +<td>Public method to retrieve the entered uncommit data.</td> +</tr> +<tr> +<td><a href="#HgUncommitDialog.on_recentComboBox_activated">on_recentComboBox_activated</a></td> +<td>Private slot to select a commit message from recent ones.</td> +</tr> +</table> + +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> + + +<a NAME="HgUncommitDialog.__init__" ID="HgUncommitDialog.__init__"></a> +<h4>HgUncommitDialog (Constructor)</h4> +<b>HgUncommitDialog</b>(<i>vcs, parent=None</i>) +<p> + Constructor +</p> + +<dl> + +<dt><i>vcs</i> (Hg)</dt> +<dd> +reference to the version control object +</dd> +<dt><i>parent</i> (QWidget (optional))</dt> +<dd> +reference to the parent widget (defaults to None) +</dd> +</dl> +<a NAME="HgUncommitDialog.getUncommitData" ID="HgUncommitDialog.getUncommitData"></a> +<h4>HgUncommitDialog.getUncommitData</h4> +<b>getUncommitData</b>(<i></i>) +<p> + Public method to retrieve the entered uncommit data. +</p> + +<dl> +<dt>Return:</dt> +<dd> +tuple containing the commit message, a flag indicating to + allow an empty commit, a flag indicating to allow an uncommit + with outstanding changes, name of the author and date/time of + the commit +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +tuple of (str, bool, bool, str, str) +</dd> +</dl> +<a NAME="HgUncommitDialog.on_recentComboBox_activated" ID="HgUncommitDialog.on_recentComboBox_activated"></a> +<h4>HgUncommitDialog.on_recentComboBox_activated</h4> +<b>on_recentComboBox_activated</b>(<i>index</i>) +<p> + Private slot to select a commit message from recent ones. +</p> + +<dl> + +<dt><i>index</i> (int)</dt> +<dd> +index of the selected entry +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.ProjectBrowserHelper.html Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,195 @@ +<!DOCTYPE html> +<html><head> +<title>eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.ProjectBrowserHelper</title> +<meta charset="UTF-8"> +<link rel="stylesheet" href="styles.css"> +</head> +<body> +<a NAME="top" ID="top"></a> +<h1>eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.ProjectBrowserHelper</h1> +<p> +Module implementing the uncommit extension project browser helper. +</p> + +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Classes</h3> +<table> +<tr> +<td><a href="#UncommitProjectBrowserHelper">UncommitProjectBrowserHelper</a></td> +<td>Class implementing the uncommit extension project browser helper.</td> +</tr> +</table> + +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> + +<hr /> +<hr /> +<a NAME="UncommitProjectBrowserHelper" ID="UncommitProjectBrowserHelper"></a> +<h2>UncommitProjectBrowserHelper</h2> +<p> + Class implementing the uncommit extension project browser helper. +</p> + +<h3>Derived from</h3> +HgExtensionProjectBrowserHelper +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Methods</h3> +<table> +<tr> +<td><a href="#UncommitProjectBrowserHelper.__init__">UncommitProjectBrowserHelper</a></td> +<td>Constructor</td> +</tr> +<tr> +<td><a href="#UncommitProjectBrowserHelper.__hgUncommit">__hgUncommit</a></td> +<td>Private slot to undo the effect of a local commit.</td> +</tr> +<tr> +<td><a href="#UncommitProjectBrowserHelper.__reopenProject">__reopenProject</a></td> +<td>Private method to reopen the project if needed and wanted.</td> +</tr> +<tr> +<td><a href="#UncommitProjectBrowserHelper.initMenus">initMenus</a></td> +<td>Public method to generate the extension menus.</td> +</tr> +<tr> +<td><a href="#UncommitProjectBrowserHelper.menuTitle">menuTitle</a></td> +<td>Public method to get the menu title.</td> +</tr> +<tr> +<td><a href="#UncommitProjectBrowserHelper.showMenu">showMenu</a></td> +<td>Public method to prepare the extension menu for display.</td> +</tr> +</table> + +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> + + +<a NAME="UncommitProjectBrowserHelper.__init__" ID="UncommitProjectBrowserHelper.__init__"></a> +<h4>UncommitProjectBrowserHelper (Constructor)</h4> +<b>UncommitProjectBrowserHelper</b>(<i>vcsObject, browserObject, projectObject</i>) +<p> + Constructor +</p> + +<dl> + +<dt><i>vcsObject</i> (Hg)</dt> +<dd> +reference to the vcs object +</dd> +<dt><i>browserObject</i> (ProjectBaseBrowser)</dt> +<dd> +reference to the project browser object +</dd> +<dt><i>projectObject</i> (Project)</dt> +<dd> +reference to the project object +</dd> +</dl> +<a NAME="UncommitProjectBrowserHelper.__hgUncommit" ID="UncommitProjectBrowserHelper.__hgUncommit"></a> +<h4>UncommitProjectBrowserHelper.__hgUncommit</h4> +<b>__hgUncommit</b>(<i></i>) +<p> + Private slot to undo the effect of a local commit. +</p> + +<a NAME="UncommitProjectBrowserHelper.__reopenProject" ID="UncommitProjectBrowserHelper.__reopenProject"></a> +<h4>UncommitProjectBrowserHelper.__reopenProject</h4> +<b>__reopenProject</b>(<i>shouldReopen, title</i>) +<p> + Private method to reopen the project if needed and wanted. +</p> + +<dl> + +<dt><i>shouldReopen</i> (bool)</dt> +<dd> +flag indicating that the project should + be reopened +</dd> +<dt><i>title</i> (str)</dt> +<dd> +title of the message box +</dd> +</dl> +<a NAME="UncommitProjectBrowserHelper.initMenus" ID="UncommitProjectBrowserHelper.initMenus"></a> +<h4>UncommitProjectBrowserHelper.initMenus</h4> +<b>initMenus</b>(<i></i>) +<p> + Public method to generate the extension menus. +</p> + +<dl> +<dt>Return:</dt> +<dd> +dictionary of populated menu. The dict must have the keys 'mainMenu', + 'multiMenu', 'backMenu', 'dirMenu' and 'dirMultiMenu'. +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +dict of QMenu +</dd> +</dl> +<a NAME="UncommitProjectBrowserHelper.menuTitle" ID="UncommitProjectBrowserHelper.menuTitle"></a> +<h4>UncommitProjectBrowserHelper.menuTitle</h4> +<b>menuTitle</b>(<i></i>) +<p> + Public method to get the menu title. +</p> + +<dl> +<dt>Return:</dt> +<dd> +title of the menu +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl> +<a NAME="UncommitProjectBrowserHelper.showMenu" ID="UncommitProjectBrowserHelper.showMenu"></a> +<h4>UncommitProjectBrowserHelper.showMenu</h4> +<b>showMenu</b>(<i>key, controlled</i>) +<p> + Public method to prepare the extension menu for display. +</p> + +<dl> + +<dt><i>key</i> (str)</dt> +<dd> +menu key (one of 'mainMenu', 'multiMenu', 'backMenu', 'dirMenu' + or 'dirMultiMenu') +</dd> +<dt><i>controlled</i> (bool)</dt> +<dd> +flag indicating to prepare the menu for a + version controlled entry or a non-version controlled entry +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.ProjectHelper.html Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,173 @@ +<!DOCTYPE html> +<html><head> +<title>eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.ProjectHelper</title> +<meta charset="UTF-8"> +<link rel="stylesheet" href="styles.css"> +</head> +<body> +<a NAME="top" ID="top"></a> +<h1>eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.ProjectHelper</h1> +<p> +Module implementing the uncommit extension project helper. +</p> + +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Classes</h3> +<table> +<tr> +<td><a href="#UncommitProjectHelper">UncommitProjectHelper</a></td> +<td>Class implementing the uncommit extension project helper.</td> +</tr> +</table> + +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> + +<hr /> +<hr /> +<a NAME="UncommitProjectHelper" ID="UncommitProjectHelper"></a> +<h2>UncommitProjectHelper</h2> +<p> + Class implementing the uncommit extension project helper. +</p> + +<h3>Derived from</h3> +HgExtensionProjectHelper +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Methods</h3> +<table> +<tr> +<td><a href="#UncommitProjectHelper.__init__">UncommitProjectHelper</a></td> +<td>Constructor</td> +</tr> +<tr> +<td><a href="#UncommitProjectHelper.__hgUncommit">__hgUncommit</a></td> +<td>Private slot to undo a local commit.</td> +</tr> +<tr> +<td><a href="#UncommitProjectHelper.__reopenProject">__reopenProject</a></td> +<td>Private method to reopen the project if needed and wanted.</td> +</tr> +<tr> +<td><a href="#UncommitProjectHelper.initActions">initActions</a></td> +<td>Public method to generate the action objects.</td> +</tr> +<tr> +<td><a href="#UncommitProjectHelper.initMenu">initMenu</a></td> +<td>Public method to generate the extension menu.</td> +</tr> +<tr> +<td><a href="#UncommitProjectHelper.menuTitle">menuTitle</a></td> +<td>Public method to get the menu title.</td> +</tr> +</table> + +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> + + +<a NAME="UncommitProjectHelper.__init__" ID="UncommitProjectHelper.__init__"></a> +<h4>UncommitProjectHelper (Constructor)</h4> +<b>UncommitProjectHelper</b>(<i></i>) +<p> + Constructor +</p> + +<a NAME="UncommitProjectHelper.__hgUncommit" ID="UncommitProjectHelper.__hgUncommit"></a> +<h4>UncommitProjectHelper.__hgUncommit</h4> +<b>__hgUncommit</b>(<i></i>) +<p> + Private slot to undo a local commit. +</p> + +<a NAME="UncommitProjectHelper.__reopenProject" ID="UncommitProjectHelper.__reopenProject"></a> +<h4>UncommitProjectHelper.__reopenProject</h4> +<b>__reopenProject</b>(<i>shouldReopen, title</i>) +<p> + Private method to reopen the project if needed and wanted. +</p> + +<dl> + +<dt><i>shouldReopen</i> (bool)</dt> +<dd> +flag indicating that the project should + be reopened +</dd> +<dt><i>title</i> (str)</dt> +<dd> +title of the message box +</dd> +</dl> +<a NAME="UncommitProjectHelper.initActions" ID="UncommitProjectHelper.initActions"></a> +<h4>UncommitProjectHelper.initActions</h4> +<b>initActions</b>(<i></i>) +<p> + Public method to generate the action objects. +</p> + +<a NAME="UncommitProjectHelper.initMenu" ID="UncommitProjectHelper.initMenu"></a> +<h4>UncommitProjectHelper.initMenu</h4> +<b>initMenu</b>(<i>mainMenu</i>) +<p> + Public method to generate the extension menu. +</p> + +<dl> + +<dt><i>mainMenu</i> (QMenu)</dt> +<dd> +reference to the main menu +</dd> +</dl> +<dl> +<dt>Return:</dt> +<dd> +populated menu +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +QMenu +</dd> +</dl> +<a NAME="UncommitProjectHelper.menuTitle" ID="UncommitProjectHelper.menuTitle"></a> +<h4>UncommitProjectHelper.menuTitle</h4> +<b>menuTitle</b>(<i></i>) +<p> + Public method to get the menu title. +</p> + +<dl> +<dt>Return:</dt> +<dd> +title of the menu +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.uncommit.html Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,116 @@ +<!DOCTYPE html> +<html><head> +<title>eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.uncommit</title> +<meta charset="UTF-8"> +<link rel="stylesheet" href="styles.css"> +</head> +<body> +<a NAME="top" ID="top"></a> +<h1>eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.uncommit</h1> +<p> +Module implementing the uncommit extension interface. +</p> + +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Classes</h3> +<table> +<tr> +<td><a href="#Uncommit">Uncommit</a></td> +<td>Class implementing the uncommit extension interface.</td> +</tr> +</table> + +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> + +<hr /> +<hr /> +<a NAME="Uncommit" ID="Uncommit"></a> +<h2>Uncommit</h2> +<p> + Class implementing the uncommit extension interface. +</p> + +<h3>Derived from</h3> +HgExtension +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> + +<h3>Methods</h3> +<table> +<tr> +<td><a href="#Uncommit.__init__">Uncommit</a></td> +<td>Constructor</td> +</tr> +<tr> +<td><a href="#Uncommit.hgUncommit">hgUncommit</a></td> +<td>Public method to undo the effect of a local commit.</td> +</tr> +</table> + +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> + + +<a NAME="Uncommit.__init__" ID="Uncommit.__init__"></a> +<h4>Uncommit (Constructor)</h4> +<b>Uncommit</b>(<i>vcs, ui=None</i>) +<p> + Constructor +</p> + +<dl> + +<dt><i>vcs</i> (Hg)</dt> +<dd> +reference to the Mercurial vcs object +</dd> +<dt><i>ui</i> (QWidget)</dt> +<dd> +reference to a UI widget (defaults to None) +</dd> +</dl> +<a NAME="Uncommit.hgUncommit" ID="Uncommit.hgUncommit"></a> +<h4>Uncommit.hgUncommit</h4> +<b>hgUncommit</b>(<i>names=None</i>) +<p> + Public method to undo the effect of a local commit. +</p> + +<dl> + +<dt><i>names</i> (list of str)</dt> +<dd> +list of file or directory paths (defaults to None) +</dd> +</dl> +<dl> +<dt>Return:</dt> +<dd> +flag indicating that the project should be reread +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html>
--- a/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.hg.html Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.hg.html Tue Jan 14 17:29:56 2025 +0100 @@ -134,6 +134,10 @@ <td>Public method to clear the status cache.</td> </tr> <tr> +<td><a href="#Hg.getBuiltinObject">getBuiltinObject</a></td> +<td>Public method to get a reference to a builtins object.</td> +</tr> +<tr> <td><a href="#Hg.getClient">getClient</a></td> <td>Public method to get a reference to the command server interface.</td> </tr> @@ -846,6 +850,32 @@ Public method to clear the status cache. </p> +<a NAME="Hg.getBuiltinObject" ID="Hg.getBuiltinObject"></a> +<h4>Hg.getBuiltinObject</h4> +<b>getBuiltinObject</b>(<i>builtinName</i>) +<p> + Public method to get a reference to a builtins object. +</p> + +<dl> + +<dt><i>builtinName</i> (str)</dt> +<dd> +name of the builtin +</dd> +</dl> +<dl> +<dt>Return:</dt> +<dd> +reference to the builtin object +</dd> +</dl> +<dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl> <a NAME="Hg.getClient" ID="Hg.getClient"></a> <h4>Hg.getClient</h4> <b>getClient</b>(<i></i>) @@ -1655,16 +1685,21 @@ <a NAME="Hg.hgPull" ID="Hg.hgPull"></a> <h4>Hg.hgPull</h4> -<b>hgPull</b>(<i>revisions=None</i>) +<b>hgPull</b>(<i>revisions=None, noupdate=False</i>) <p> Public method used to pull changes from a remote Mercurial repository. </p> <dl> -<dt><i>revisions</i> (list of str)</dt> +<dt><i>revisions</i> (list of str (optional))</dt> <dd> -list of revisions to be pulled +list of revisions to be pulled (defaults to None) +</dd> +<dt><i>noupdate</i> (bool (optional))</dt> +<dd> +flag indicate to not update the working directory (defaults + to False) </dd> </dl> <dl>
--- a/src/eric7/Documentation/Source/eric7.WebBrowser.FeaturePermissions.FeaturePermissionBar.html Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Documentation/Source/eric7.WebBrowser.FeaturePermissions.FeaturePermissionBar.html Tue Jan 14 17:29:56 2025 +0100 @@ -36,6 +36,9 @@ <p> Class implementing the feature permission bar widget. </p> +<p> + Note: This is not needed for Qt 6.8+. +</p> <h3>Derived from</h3> EricAnimatedWidget @@ -65,7 +68,7 @@ </tr> <tr> <td><a href="#FeaturePermissionBar.__permissionUnknown">__permissionUnknown</a></td> -<td>Private slot handling the user closing the dialog without.</td> +<td>Private slot handling the user closing the dialog without a selection.</td> </tr> <tr> <td><a href="#FeaturePermissionBar.hide">hide</a></td> @@ -123,7 +126,7 @@ <h4>FeaturePermissionBar.__permissionUnknown</h4> <b>__permissionUnknown</b>(<i></i>) <p> - Private slot handling the user closing the dialog without. + Private slot handling the user closing the dialog without a selection. </p> <a NAME="FeaturePermissionBar.hide" ID="FeaturePermissionBar.hide"></a>
--- a/src/eric7/Documentation/Source/eric7.WebBrowser.FeaturePermissions.FeaturePermissionManager.html Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Documentation/Source/eric7.WebBrowser.FeaturePermissions.FeaturePermissionManager.html Tue Jan 14 17:29:56 2025 +0100 @@ -36,6 +36,9 @@ <p> Class implementing the feature permission manager object. </p> +<p> + Note: This is not needed for Qt 6.8+. +</p> <h3>Derived from</h3> QObject
--- a/src/eric7/Documentation/Source/eric7.WebBrowser.FeaturePermissions.FeaturePermissionsDialog.html Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Documentation/Source/eric7.WebBrowser.FeaturePermissions.FeaturePermissionsDialog.html Tue Jan 14 17:29:56 2025 +0100 @@ -60,6 +60,14 @@ <td>Private slot handling changes of the selected tab.</td> </tr> <tr> +<td><a href="#FeaturePermissionsDialog.__initializePermissionsList_qt67">__initializePermissionsList_qt67</a></td> +<td>Private method to initialize the permission lists for Qt <6.8.</td> +</tr> +<tr> +<td><a href="#FeaturePermissionsDialog.__initializePermissionsList_qt68">__initializePermissionsList_qt68</a></td> +<td>Private method to initialize the permission lists for Qt 6.8+.</td> +</tr> +<tr> <td><a href="#FeaturePermissionsDialog.__itemSelectionChanged">__itemSelectionChanged</a></td> <td>Private slot handling changes in the current list of selected items.</td> </tr> @@ -79,6 +87,10 @@ <td><a href="#FeaturePermissionsDialog.on_removeButton_clicked">on_removeButton_clicked</a></td> <td>Private slot to remove selected entries.</td> </tr> +<tr> +<td><a href="#FeaturePermissionsDialog.persistChanges">persistChanges</a></td> +<td>Public method to persist the removed permissions.</td> +</tr> </table> <h3>Static Methods</h3> @@ -96,10 +108,10 @@ <dl> -<dt><i>featurePermissions</i> (dict of dict of list)</dt> +<dt><i>featurePermissions</i> (dict of dict of list or list of QWebEnginePermission)</dt> <dd> dictionary with remembered feature - permissions + permissions (Qt <6.8) or a list of permission objects (Qt 6.8+) </dd> <dt><i>parent</i> (QWidget)</dt> <dd> @@ -120,6 +132,34 @@ index of the current tab </dd> </dl> +<a NAME="FeaturePermissionsDialog.__initializePermissionsList_qt67" ID="FeaturePermissionsDialog.__initializePermissionsList_qt67"></a> +<h4>FeaturePermissionsDialog.__initializePermissionsList_qt67</h4> +<b>__initializePermissionsList_qt67</b>(<i>permissions</i>) +<p> + Private method to initialize the permission lists for Qt <6.8. +</p> + +<dl> + +<dt><i>permissions</i> (dict of dict of list)</dt> +<dd> +dictionary with remembered feature permissions +</dd> +</dl> +<a NAME="FeaturePermissionsDialog.__initializePermissionsList_qt68" ID="FeaturePermissionsDialog.__initializePermissionsList_qt68"></a> +<h4>FeaturePermissionsDialog.__initializePermissionsList_qt68</h4> +<b>__initializePermissionsList_qt68</b>(<i>permissions</i>) +<p> + Private method to initialize the permission lists for Qt 6.8+. +</p> + +<dl> + +<dt><i>permissions</i> (list of QWebEnginePermission)</dt> +<dd> +list of permission objects +</dd> +</dl> <a NAME="FeaturePermissionsDialog.__itemSelectionChanged" ID="FeaturePermissionsDialog.__itemSelectionChanged"></a> <h4>FeaturePermissionsDialog.__itemSelectionChanged</h4> <b>__itemSelectionChanged</b>(<i></i>) @@ -167,6 +207,13 @@ Private slot to remove selected entries. </p> +<a NAME="FeaturePermissionsDialog.persistChanges" ID="FeaturePermissionsDialog.persistChanges"></a> +<h4>FeaturePermissionsDialog.persistChanges</h4> +<b>persistChanges</b>(<i></i>) +<p> + Public method to persist the removed permissions. +</p> + <div align="right"><a href="#top">Up</a></div> <hr /> </body></html>
--- a/src/eric7/Documentation/Source/eric7.WebBrowser.WebBrowserClearPrivateDataDialog.html Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Documentation/Source/eric7.WebBrowser.WebBrowserClearPrivateDataDialog.html Tue Jan 14 17:29:56 2025 +0100 @@ -93,14 +93,15 @@ <dd> tuple with flags indicating which data to clear (browsing history, search history, favicons, disk cache, cookies, - passwords, downloads, zoom values, SSL certificate error exceptions) and - the selected history period in milliseconds + passwords, downloads, zoom values, SSL certificate error exceptions, + website permissions) and the selected history period in milliseconds </dd> </dl> <dl> <dt>Return Type:</dt> <dd> -tuple of (bool, bool, bool, bool, bool, bool, bool, bool, bool, int) +tuple of (bool, bool, bool, bool, bool, bool, bool, bool, bool, bool, + int) </dd> </dl> <div align="right"><a href="#top">Up</a></div>
--- a/src/eric7/Documentation/Source/eric7.WebBrowser.WebBrowserPage.html Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Documentation/Source/eric7.WebBrowser.WebBrowserPage.html Tue Jan 14 17:29:56 2025 +0100 @@ -70,6 +70,7 @@ QWebEnginePage <h3>Class Attributes</h3> <table> +<tr><td>PermissionTypeQuestions</td></tr> <tr><td>SafeJsWorld</td></tr> <tr><td>UnsafeJsWorld</td></tr> </table> @@ -109,6 +110,10 @@ <td>Private slot handling a full screen request.</td> </tr> <tr> +<td><a href="#WebBrowserPage.__permissionRequested">__permissionRequested</a></td> +<td>Private slot handling a permission request.</td> +</tr> +<tr> <td><a href="#WebBrowserPage.__registerProtocolHandlerRequested">__registerProtocolHandlerRequested</a></td> <td>Private slot to handle the registration of a custom protocol handler.</td> </tr> @@ -138,7 +143,7 @@ </tr> <tr> <td><a href="#WebBrowserPage.execJavaScript">execJavaScript</a></td> -<td>Public method to execute a JavaScript function synchroneously.</td> +<td>Public method to execute a JavaScript function synchronously.</td> </tr> <tr> <td><a href="#WebBrowserPage.getSafeBrowsingStatus">getSafeBrowsingStatus</a></td> @@ -344,6 +349,20 @@ reference to the full screen request </dd> </dl> +<a NAME="WebBrowserPage.__permissionRequested" ID="WebBrowserPage.__permissionRequested"></a> +<h4>WebBrowserPage.__permissionRequested</h4> +<b>__permissionRequested</b>(<i>permission</i>) +<p> + Private slot handling a permission request. +</p> + +<dl> + +<dt><i>permission</i> (QWebEnginePermission)</dt> +<dd> +reference to the permission request object +</dd> +</dl> <a NAME="WebBrowserPage.__registerProtocolHandlerRequested" ID="WebBrowserPage.__registerProtocolHandlerRequested"></a> <h4>WebBrowserPage.__registerProtocolHandlerRequested</h4> <b>__registerProtocolHandlerRequested</b>(<i>request</i>) @@ -466,7 +485,7 @@ <h4>WebBrowserPage.execJavaScript</h4> <b>execJavaScript</b>(<i>script, worldId=QWebEngineScript.ScriptWorldId.MainWorld, timeout=500</i>) <p> - Public method to execute a JavaScript function synchroneously. + Public method to execute a JavaScript function synchronously. </p> <dl>
--- a/src/eric7/Documentation/Source/index-eric7.PipInterface.html Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Documentation/Source/index-eric7.PipInterface.html Tue Jan 14 17:29:56 2025 +0100 @@ -56,6 +56,10 @@ <td>Module implementing a Python package vulnerability checker.</td> </tr> <tr> +<td><a href="eric7.PipInterface.pipcleanup.html">pipcleanup</a></td> +<td>pipcleanup utility script.</td> +</tr> +<tr> <td><a href="eric7.PipInterface.piplicenses.html">piplicenses</a></td> <td>pip-licenses</td> </tr>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Documentation/Source/index-eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.html Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,31 @@ +<!DOCTYPE html> +<html><head> +<title>eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension</title> +<meta charset="UTF-8"> +<link rel="stylesheet" href="styles.css"> +</head> +<body> +<h1>eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension</h1> +<p> +Package implementing the fastexport extension support interface. +</p> + + + +<h3>Modules</h3> +<table> + +<tr> +<td><a href="eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.HgFastexportConfigDialog.html">HgFastexportConfigDialog</a></td> +<td>Module implementing the fastexport configuration dialog.</td> +</tr> +<tr> +<td><a href="eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.ProjectHelper.html">ProjectHelper</a></td> +<td>Module implementing the fastexport extension project helper.</td> +</tr> +<tr> +<td><a href="eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.fastexport.html">fastexport</a></td> +<td>Module implementing the fastexport extension interface.</td> +</tr> +</table> +</body></html>
--- a/src/eric7/Documentation/Source/index-eric7.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.html Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Documentation/Source/index-eric7.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.html Tue Jan 14 17:29:56 2025 +0100 @@ -29,7 +29,7 @@ </tr> <tr> <td><a href="eric7.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.ProjectHelper.html">ProjectHelper</a></td> -<td>Module implementing the shelve extension project helper.</td> +<td>Module implementing the largefiles extension project helper.</td> </tr> <tr> <td><a href="eric7.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.__init__.html">LargefilesExtension</a></td>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Documentation/Source/index-eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.html Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,31 @@ +<!DOCTYPE html> +<html><head> +<title>eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin</title> +<meta charset="UTF-8"> +<link rel="stylesheet" href="styles.css"> +</head> +<body> +<h1>eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin</h1> +<p> +Package implementing the purge extension support interface. +</p> + + + +<h3>Modules</h3> +<table> + +<tr> +<td><a href="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.HgPurgeListDialog.html">HgPurgeListDialog</a></td> +<td>Module implementing a dialog to list all files not tracked by Mercurial.</td> +</tr> +<tr> +<td><a href="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.ProjectHelper.html">ProjectHelper</a></td> +<td>Module implementing the purge extension project helper.</td> +</tr> +<tr> +<td><a href="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.purge.html">purge</a></td> +<td>Module implementing the purge extension interface.</td> +</tr> +</table> +</body></html>
--- a/src/eric7/Documentation/Source/index-eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.html Sat Nov 30 11:09:02 2024 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,31 +0,0 @@ -<!DOCTYPE html> -<html><head> -<title>eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension</title> -<meta charset="UTF-8"> -<link rel="stylesheet" href="styles.css"> -</head> -<body> -<h1>eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension</h1> -<p> -Package implementing the purge extension support interface. -</p> - - - -<h3>Modules</h3> -<table> - -<tr> -<td><a href="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.HgPurgeListDialog.html">HgPurgeListDialog</a></td> -<td>Module implementing a dialog to list all files not tracked by Mercurial.</td> -</tr> -<tr> -<td><a href="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.ProjectHelper.html">ProjectHelper</a></td> -<td>Module implementing the purge extension project helper.</td> -</tr> -<tr> -<td><a href="eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.purge.html">purge</a></td> -<td>Module implementing the purge extension interface.</td> -</tr> -</table> -</body></html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Documentation/Source/index-eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.html Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,47 @@ +<!DOCTYPE html> +<html><head> +<title>eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin</title> +<meta charset="UTF-8"> +<link rel="stylesheet" href="styles.css"> +</head> +<body> +<h1>eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin</h1> +<p> +Package implementing the shelve extension support interface. +</p> + + + +<h3>Modules</h3> +<table> + +<tr> +<td><a href="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveBrowserDialog.html">HgShelveBrowserDialog</a></td> +<td>Module implementing Mercurial shelve browser dialog.</td> +</tr> +<tr> +<td><a href="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelveDataDialog.html">HgShelveDataDialog</a></td> +<td>Module implementing a dialog to enter the data for a shelve operation.</td> +</tr> +<tr> +<td><a href="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgShelvesSelectionDialog.html">HgShelvesSelectionDialog</a></td> +<td>Module implementing a dialog to select multiple shelve names.</td> +</tr> +<tr> +<td><a href="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.HgUnshelveDataDialog.html">HgUnshelveDataDialog</a></td> +<td>Module implementing a dialog to enter the data for an unshelve operation.</td> +</tr> +<tr> +<td><a href="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.ProjectBrowserHelper.html">ProjectBrowserHelper</a></td> +<td>Module implementing the shelve extension project browser helper.</td> +</tr> +<tr> +<td><a href="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.ProjectHelper.html">ProjectHelper</a></td> +<td>Module implementing the shelve extension project helper.</td> +</tr> +<tr> +<td><a href="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.shelve.html">shelve</a></td> +<td>Module implementing the shelve extension interface.</td> +</tr> +</table> +</body></html>
--- a/src/eric7/Documentation/Source/index-eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.html Sat Nov 30 11:09:02 2024 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,47 +0,0 @@ -<!DOCTYPE html> -<html><head> -<title>eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension</title> -<meta charset="UTF-8"> -<link rel="stylesheet" href="styles.css"> -</head> -<body> -<h1>eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension</h1> -<p> -Package implementing the shelve extension support interface. -</p> - - - -<h3>Modules</h3> -<table> - -<tr> -<td><a href="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveBrowserDialog.html">HgShelveBrowserDialog</a></td> -<td>Module implementing Mercurial shelve browser dialog.</td> -</tr> -<tr> -<td><a href="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelveDataDialog.html">HgShelveDataDialog</a></td> -<td>Module implementing a dialog to enter the data for a shelve operation.</td> -</tr> -<tr> -<td><a href="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgShelvesSelectionDialog.html">HgShelvesSelectionDialog</a></td> -<td>Module implementing a dialog to select multiple shelve names.</td> -</tr> -<tr> -<td><a href="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.HgUnshelveDataDialog.html">HgUnshelveDataDialog</a></td> -<td>Module implementing a dialog to enter the data for an unshelve operation.</td> -</tr> -<tr> -<td><a href="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectBrowserHelper.html">ProjectBrowserHelper</a></td> -<td>Module implementing the shelve extension project browser helper.</td> -</tr> -<tr> -<td><a href="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.ProjectHelper.html">ProjectHelper</a></td> -<td>Module implementing the shelve extension project helper.</td> -</tr> -<tr> -<td><a href="eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.shelve.html">shelve</a></td> -<td>Module implementing the shelve extension interface.</td> -</tr> -</table> -</body></html>
--- a/src/eric7/Documentation/Source/index-eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.html Sat Nov 30 11:09:02 2024 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,31 +0,0 @@ -<!DOCTYPE html> -<html><head> -<title>eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension</title> -<meta charset="UTF-8"> -<link rel="stylesheet" href="styles.css"> -</head> -<body> -<h1>eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension</h1> -<p> -Package implementing the strip extension support interface. -</p> - - - -<h3>Modules</h3> -<table> - -<tr> -<td><a href="eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.HgStripDialog.html">HgStripDialog</a></td> -<td>Module implementing a dialog to enter the data to strip changesets.</td> -</tr> -<tr> -<td><a href="eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.ProjectHelper.html">ProjectHelper</a></td> -<td>Module implementing the strip extension project helper.</td> -</tr> -<tr> -<td><a href="eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.strip.html">strip</a></td> -<td>Module implementing the strip extension interface.</td> -</tr> -</table> -</body></html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Documentation/Source/index-eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.html Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,35 @@ +<!DOCTYPE html> +<html><head> +<title>eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension</title> +<meta charset="UTF-8"> +<link rel="stylesheet" href="styles.css"> +</head> +<body> +<h1>eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension</h1> +<p> +Package implementing the uncommit extension support interface. +</p> + + + +<h3>Modules</h3> +<table> + +<tr> +<td><a href="eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.HgUncommitDialog.html">HgUncommitDialog</a></td> +<td>Module implementing a dialog to enter the uncommit data.</td> +</tr> +<tr> +<td><a href="eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.ProjectBrowserHelper.html">ProjectBrowserHelper</a></td> +<td>Module implementing the uncommit extension project browser helper.</td> +</tr> +<tr> +<td><a href="eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.ProjectHelper.html">ProjectHelper</a></td> +<td>Module implementing the uncommit extension project helper.</td> +</tr> +<tr> +<td><a href="eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.uncommit.html">uncommit</a></td> +<td>Module implementing the uncommit extension interface.</td> +</tr> +</table> +</body></html>
--- a/src/eric7/Documentation/Source/index-eric7.Plugins.VcsPlugins.vcsMercurial.html Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Documentation/Source/index-eric7.Plugins.VcsPlugins.vcsMercurial.html Tue Jan 14 17:29:56 2025 +0100 @@ -27,6 +27,10 @@ <td>Package implementing the the Mercurial configuration page.</td> </tr> <tr> +<td><a href="index-eric7.Plugins.VcsPlugins.vcsMercurial.FastexportExtension.html">FastexportExtension</a></td> +<td>Package implementing the fastexport extension support interface.</td> +</tr> +<tr> <td><a href="index-eric7.Plugins.VcsPlugins.vcsMercurial.GpgExtension.html">GpgExtension</a></td> <td>Package implementing the gpg extension support interface.</td> </tr> @@ -39,7 +43,7 @@ <td>Package implementing the largefiles extension support interface.</td> </tr> <tr> -<td><a href="index-eric7.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.html">PurgeExtension</a></td> +<td><a href="index-eric7.Plugins.VcsPlugins.vcsMercurial.PurgeBuiltin.html">PurgeBuiltin</a></td> <td>Package implementing the purge extension support interface.</td> </tr> <tr> @@ -51,12 +55,12 @@ <td>Package implementing the rebase extension support interface.</td> </tr> <tr> -<td><a href="index-eric7.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.html">ShelveExtension</a></td> +<td><a href="index-eric7.Plugins.VcsPlugins.vcsMercurial.ShelveBuiltin.html">ShelveBuiltin</a></td> <td>Package implementing the shelve extension support interface.</td> </tr> <tr> -<td><a href="index-eric7.Plugins.VcsPlugins.vcsMercurial.StripExtension.html">StripExtension</a></td> -<td>Package implementing the strip extension support interface.</td> +<td><a href="index-eric7.Plugins.VcsPlugins.vcsMercurial.UncommitExtension.html">UncommitExtension</a></td> +<td>Package implementing the uncommit extension support interface.</td> </tr> </table>
--- a/src/eric7/DocumentationTools/APIGenerator.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/DocumentationTools/APIGenerator.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2004 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2004 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/DocumentationTools/Config.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/DocumentationTools/Config.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/DocumentationTools/IndexGenerator.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/DocumentationTools/IndexGenerator.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/DocumentationTools/ModuleDocumentor.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/DocumentationTools/ModuleDocumentor.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/DocumentationTools/QtHelpGenerator.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/DocumentationTools/QtHelpGenerator.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/DocumentationTools/TemplatesListsStyleCSS.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/DocumentationTools/TemplatesListsStyleCSS.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2005 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2005 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/DocumentationTools/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/DocumentationTools/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricCore/EricFileSystemWatcher.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricCore/EricFileSystemWatcher.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2024 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricCore/EricPreferences.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricCore/EricPreferences.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2024 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricCore/EricProcess.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricCore/EricProcess.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2024 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricCore/EricStdRedirector.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricCore/EricStdRedirector.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2024 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricCore/EricTreeSortFilterProxyModel.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricCore/EricTreeSortFilterProxyModel.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricCore/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricCore/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricGraphics/EricArrowItem.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricGraphics/EricArrowItem.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricGraphics/EricGraphicsView.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricGraphics/EricGraphicsView.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricGraphics/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricGraphics/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricGui/EricAction.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricGui/EricAction.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricGui/EricFileIconProvider.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricGui/EricFileIconProvider.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2024 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricGui/EricGenericDiffHighlighter.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricGui/EricGenericDiffHighlighter.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricGui/EricOverrideCursor.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricGui/EricOverrideCursor.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricGui/EricPixmapCache.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricGui/EricPixmapCache.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2004 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2004 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricGui/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricGui/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricNetwork/EricFtp.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricNetwork/EricFtp.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricNetwork/EricGoogleMail.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricNetwork/EricGoogleMail.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricNetwork/EricGoogleMailHelpers.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricNetwork/EricGoogleMailHelpers.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricNetwork/EricHostnameInputWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricNetwork/EricHostnameInputWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricNetwork/EricIPv4InputWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricNetwork/EricIPv4InputWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricNetwork/EricJsonClient.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricNetwork/EricJsonClient.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricNetwork/EricJsonServer.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricNetwork/EricJsonServer.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricNetwork/EricJsonStreamReader.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricNetwork/EricJsonStreamReader.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricNetwork/EricJsonStreamWriter.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricNetwork/EricJsonStreamWriter.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricNetwork/EricNetworkIcon.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricNetwork/EricNetworkIcon.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricNetwork/EricNetworkProxyFactory.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricNetwork/EricNetworkProxyFactory.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -164,14 +164,14 @@ @return list of proxies in order of preference @rtype list of QNetworkProxy """ - if ( + # use proxy at all? + if not EricPreferences.getNetworkProxy("UseProxy"): + return [QNetworkProxy(QNetworkProxy.ProxyType.NoProxy)] + + elif ( query.queryType() == QNetworkProxyQuery.QueryType.UrlRequest and query.protocolTag() in ["http", "https", "ftp"] ): - # use proxy at all? - if not EricPreferences.getNetworkProxy("UseProxy"): - return [QNetworkProxy(QNetworkProxy.ProxyType.NoProxy)] - # test for exceptions exceptions = EricPreferences.getNetworkProxy("ProxyExceptions") if exceptions != self.__exceptions: @@ -273,5 +273,6 @@ else: proxy = QNetworkProxy(QNetworkProxy.ProxyType.DefaultProxy) return [proxy, QNetworkProxy(QNetworkProxy.ProxyType.DefaultProxy)] + else: return [QNetworkProxy(QNetworkProxy.ProxyType.NoProxy)]
--- a/src/eric7/EricNetwork/EricNetworkUtilities.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricNetwork/EricNetworkUtilities.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricNetwork/EricSslCertificateSelectionDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricNetwork/EricSslCertificateSelectionDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricNetwork/EricSslCertificatesDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricNetwork/EricSslCertificatesDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricNetwork/EricSslCertificatesInfoDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricNetwork/EricSslCertificatesInfoDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricNetwork/EricSslCertificatesInfoWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricNetwork/EricSslCertificatesInfoWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricNetwork/EricSslErrorHandler.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricNetwork/EricSslErrorHandler.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2013 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2013 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricNetwork/EricSslInfoWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricNetwork/EricSslInfoWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricNetwork/EricSslUtilities.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricNetwork/EricSslUtilities.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricNetwork/EricTldExtractor.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricNetwork/EricTldExtractor.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricNetwork/EricUrlInfo.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricNetwork/EricUrlInfo.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricNetwork/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricNetwork/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricNetwork/data/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricNetwork/data/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricUtilities/EricCache.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricUtilities/EricCache.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricUtilities/EricMutexLocker.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricUtilities/EricMutexLocker.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricUtilities/EricPasswordChecker.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricUtilities/EricPasswordChecker.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricUtilities/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricUtilities/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricUtilities/crypto/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricUtilities/crypto/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricUtilities/crypto/py3AES.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricUtilities/crypto/py3AES.py Tue Jan 14 17:29:56 2025 +0100 @@ -17,7 +17,7 @@ # # Ported to Python3 # -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricUtilities/crypto/py3PBKDF2.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricUtilities/crypto/py3PBKDF2.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricAnimatedLabel.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricAnimatedLabel.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricAnimatedWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricAnimatedWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricApplication.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricApplication.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricAuthenticationDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricAuthenticationDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2008 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2008 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricAutoResizeTextBrowser.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricAutoResizeTextBrowser.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2024 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricClickableLabel.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricClickableLabel.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricComboSelectionDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricComboSelectionDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricCompleters.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricCompleters.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricDirFileDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricDirFileDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricErrorMessage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricErrorMessage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2013 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2013 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricErrorMessageFilterDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricErrorMessageFilterDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2013 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2013 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricFileDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricFileDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricFileSaveConfirmDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricFileSaveConfirmDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2018 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2018 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricIconBar.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricIconBar.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricLed.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricLed.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricLineEdit.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricLineEdit.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricLineEditButton.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricLineEditButton.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricListSelectionDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricListSelectionDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricListView.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricListView.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricMainWindow.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricMainWindow.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricMapWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricMapWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricMessageBox.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricMessageBox.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,12 +1,14 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ Module implementing QMessageBox replacements and more convenience function. """ +import contextlib + from PyQt6.QtCore import QCoreApplication, Qt from PyQt6.QtWidgets import QApplication, QMessageBox @@ -143,7 +145,8 @@ @rtype QMessageBox.StandardButton """ if parent is None: - parent = QCoreApplication.instance().getMainWindow() + with contextlib.suppress(AttributeError): + parent = QCoreApplication.instance().getMainWindow() messageBox = QMessageBox(parent) messageBox.setIcon(icon)
--- a/src/eric7/EricWidgets/EricModelMenu.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricModelMenu.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricModelToolBar.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricModelToolBar.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricPassivePopup.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricPassivePopup.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricPasswordMeter.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricPasswordMeter.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricPathPicker.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricPathPicker.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricPathPickerDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricPathPickerDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2018 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2018 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricPlainTextDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricPlainTextDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricProcessDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricProcessDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricProgressDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricProgressDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2013 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2013 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricProxyStyle.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricProxyStyle.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricSideBar.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricSideBar.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2008 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2008 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricSimpleHelpDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricSimpleHelpDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricSingleApplication.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricSingleApplication.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2004 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2004 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricSpellCheckedTextEdit.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricSpellCheckedTextEdit.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricSqueezeLabels.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricSqueezeLabels.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2008 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2008 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricStretchableSpacer.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricStretchableSpacer.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricStringListEditWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricStringListEditWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricTabWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricTabWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2005 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2005 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricTableView.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricTableView.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricTextEditSearchWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricTextEditSearchWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricTextInputDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricTextInputDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2018 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2018 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricTextSpinBox.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricTextSpinBox.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricToolBarDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricToolBarDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2008 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2008 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricToolBarManager.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricToolBarManager.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2008 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2008 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricToolBox.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricToolBox.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2008 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2008 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricToolButton.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricToolButton.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricTreeView.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricTreeView.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricTreeWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricTreeWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/EricZoomWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/EricZoomWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2013 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2013 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/EricWidgets/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/EricWidgets/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Globals/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Globals/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Graphics/ApplicationDiagramBuilder.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Graphics/ApplicationDiagramBuilder.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Graphics/AssociationItem.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Graphics/AssociationItem.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2004 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2004 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Graphics/ClassItem.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Graphics/ClassItem.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Graphics/GraphicsUtilities.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Graphics/GraphicsUtilities.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2004 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2004 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Graphics/ImportsDiagramBuilder.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Graphics/ImportsDiagramBuilder.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Graphics/ModuleItem.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Graphics/ModuleItem.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Graphics/PackageDiagramBuilder.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Graphics/PackageDiagramBuilder.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Graphics/PackageItem.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Graphics/PackageItem.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Graphics/PixmapDiagram.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Graphics/PixmapDiagram.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2004 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2004 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Graphics/SvgDiagram.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Graphics/SvgDiagram.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2008 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2008 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Graphics/UMLClassDiagramBuilder.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Graphics/UMLClassDiagramBuilder.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Graphics/UMLDiagramBuilder.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Graphics/UMLDiagramBuilder.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Graphics/UMLDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Graphics/UMLDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Graphics/UMLGraphicsView.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Graphics/UMLGraphicsView.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Graphics/UMLItem.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Graphics/UMLItem.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2004 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2004 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Graphics/UMLSceneSizeDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Graphics/UMLSceneSizeDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2004 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2004 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Graphics/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Graphics/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2004 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2004 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/HelpViewer/HelpBookmarkPropertiesDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/HelpViewer/HelpBookmarkPropertiesDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/HelpViewer/HelpBookmarksImportDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/HelpViewer/HelpBookmarksImportDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/HelpViewer/HelpBookmarksWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/HelpViewer/HelpBookmarksWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/HelpViewer/HelpViewerImpl.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/HelpViewer/HelpViewerImpl.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/HelpViewer/HelpViewerImplQTB.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/HelpViewer/HelpViewerImplQTB.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/HelpViewer/HelpViewerImplQWE.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/HelpViewer/HelpViewerImplQWE.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/HelpViewer/HelpViewerWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/HelpViewer/HelpViewerWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -1101,7 +1101,7 @@ """ from eric7.QtHelpInterface.QtHelpSchemeHandler import QtHelpSchemeHandler - self.__webProfile = QWebEngineProfile.defaultProfile() + self.__webProfile = QWebEngineProfile("eric7") self.__webProfile.setHttpCacheType( QWebEngineProfile.HttpCacheType.MemoryHttpCache )
--- a/src/eric7/HelpViewer/OpenPagesWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/HelpViewer/OpenPagesWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/HelpViewer/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/HelpViewer/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/HexEdit/HexEditChunks.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/HexEdit/HexEditChunks.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/HexEdit/HexEditGotoWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/HexEdit/HexEditGotoWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/HexEdit/HexEditMainWindow.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/HexEdit/HexEditMainWindow.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/HexEdit/HexEditSearchReplaceWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/HexEdit/HexEditSearchReplaceWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/HexEdit/HexEditUndoStack.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/HexEdit/HexEditUndoStack.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/HexEdit/HexEditWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/HexEdit/HexEditWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/HexEdit/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/HexEdit/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/IconEditor/IconEditorGrid.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/IconEditor/IconEditorGrid.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/IconEditor/IconEditorPalette.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/IconEditor/IconEditorPalette.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/IconEditor/IconEditorWindow.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/IconEditor/IconEditorWindow.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/IconEditor/IconSizeDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/IconEditor/IconSizeDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/IconEditor/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/IconEditor/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/IconEditor/cursors/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/IconEditor/cursors/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/JediInterface/AssistantJedi.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/JediInterface/AssistantJedi.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/JediInterface/JediClient.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/JediInterface/JediClient.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/JediInterface/JediServer.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/JediInterface/JediServer.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/JediInterface/RefactoringPreviewDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/JediInterface/RefactoringPreviewDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/JediInterface/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/JediInterface/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/AddEditDevicesDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/AddEditDevicesDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/BluetoothDialogs/BluetoothAdvertisement.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/BluetoothDialogs/BluetoothAdvertisement.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/BluetoothDialogs/BluetoothController.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/BluetoothDialogs/BluetoothController.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/BluetoothDialogs/BluetoothScanWindow.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/BluetoothDialogs/BluetoothScanWindow.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/BluetoothDialogs/BluetoothStatusDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/BluetoothDialogs/BluetoothStatusDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/BluetoothDialogs/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/BluetoothDialogs/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/BoardDataDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/BoardDataDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/ConnectionSelectionDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/ConnectionSelectionDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/ConvertToUF2Dialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/ConvertToUF2Dialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/Devices/CircuitPythonDevices.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/Devices/CircuitPythonDevices.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/Devices/CircuitPythonUpdater/CircuitPythonUpdaterInterface.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/Devices/CircuitPythonUpdater/CircuitPythonUpdaterInterface.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/Devices/CircuitPythonUpdater/CircupFunctions.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/Devices/CircuitPythonUpdater/CircupFunctions.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/Devices/CircuitPythonUpdater/RequirementsDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/Devices/CircuitPythonUpdater/RequirementsDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/Devices/CircuitPythonUpdater/ShowBundlesDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/Devices/CircuitPythonUpdater/ShowBundlesDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/Devices/CircuitPythonUpdater/ShowInstalledDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/Devices/CircuitPythonUpdater/ShowInstalledDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/Devices/CircuitPythonUpdater/ShowOutdatedDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/Devices/CircuitPythonUpdater/ShowOutdatedDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/Devices/CircuitPythonUpdater/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/Devices/CircuitPythonUpdater/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/Devices/DeviceBase.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/Devices/DeviceBase.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/Devices/EspDevices.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/Devices/EspDevices.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/Devices/EspDialogs/EspBackupRestoreFirmwareDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/Devices/EspDialogs/EspBackupRestoreFirmwareDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/Devices/EspDialogs/EspFirmwareSelectionDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/Devices/EspDialogs/EspFirmwareSelectionDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/Devices/EspDialogs/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/Devices/EspDialogs/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/Devices/GenericMicroPythonDevices.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/Devices/GenericMicroPythonDevices.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/Devices/MCUScripts/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/Devices/MCUScripts/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/Devices/MicrobitDevices.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/Devices/MicrobitDevices.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/Devices/PyBoardDevices.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/Devices/PyBoardDevices.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/Devices/RP2Devices.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/Devices/RP2Devices.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/Devices/STLinkDevices.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/Devices/STLinkDevices.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/Devices/TeensyDevices.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/Devices/TeensyDevices.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/Devices/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/Devices/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -443,6 +443,7 @@ } IgnoredBoards = ( + (0x1A7E, 0x1001), # Meltex UT150-A temperature sensor (0x8086, 0x9C3D), (0x8086, None), )
--- a/src/eric7/MicroPython/EthernetDialogs/EthernetController.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/EthernetDialogs/EthernetController.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/EthernetDialogs/EthernetStatusDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/EthernetDialogs/EthernetStatusDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/EthernetDialogs/HostnameDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/EthernetDialogs/HostnameDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/EthernetDialogs/IPv4AddressDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/EthernetDialogs/IPv4AddressDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/EthernetDialogs/WiznetUtilities.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/EthernetDialogs/WiznetUtilities.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/EthernetDialogs/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/EthernetDialogs/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/IgnoredDevicesDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/IgnoredDevicesDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/MicroPythonDeviceInterface.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/MicroPythonDeviceInterface.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/MicroPythonFileManager.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/MicroPythonFileManager.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/MicroPythonFileManagerWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/MicroPythonFileManagerWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/MicroPythonFileSystemUtilities.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/MicroPythonFileSystemUtilities.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/MicroPythonGraphWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/MicroPythonGraphWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/MicroPythonProgressInfoDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/MicroPythonProgressInfoDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/MicroPythonReplWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/MicroPythonReplWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/MicroPythonSerialDeviceInterface.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/MicroPythonSerialDeviceInterface.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/MicroPythonSerialPort.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/MicroPythonSerialPort.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/MicroPythonWebreplConnectionDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/MicroPythonWebreplConnectionDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/MicroPythonWebreplDeviceInterface.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/MicroPythonWebreplDeviceInterface.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/MicroPythonWebreplParametersDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/MicroPythonWebreplParametersDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/MicroPythonWebreplSocket.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/MicroPythonWebreplSocket.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/MicroPythonWebreplUrlAddEditDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/MicroPythonWebreplUrlAddEditDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/MicroPythonWebreplUrlsConfigDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/MicroPythonWebreplUrlsConfigDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/MicroPythonWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/MicroPythonWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -311,7 +311,7 @@ "</li><li>".join( [ self.tr( - "{0} (0x{1:04x}/0x{2:04x})", "description, VId, PId" + "{0} (0x{1:04x}/0x{2:04x})", "description, VID, PID" ).format(desc, vid, pid) for vid, pid, desc in newUnknownDevices ]
--- a/src/eric7/MicroPython/MicroPythonWindow.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/MicroPythonWindow.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2024 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/MipLocalInstaller.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/MipLocalInstaller.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/MipPackageDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/MipPackageDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/NtpParametersDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/NtpParametersDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/ShowModulesDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/ShowModulesDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/Tools/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/Tools/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/UF2FlashDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/UF2FlashDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/UnknownDevicesDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/UnknownDevicesDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/WifiDialogs/WifiApConfigDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/WifiDialogs/WifiApConfigDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/WifiDialogs/WifiApStationsDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/WifiDialogs/WifiApStationsDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/WifiDialogs/WifiConnectionDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/WifiDialogs/WifiConnectionDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/WifiDialogs/WifiController.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/WifiDialogs/WifiController.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/WifiDialogs/WifiCountryDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/WifiDialogs/WifiCountryDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> #
--- a/src/eric7/MicroPython/WifiDialogs/WifiNetworksWindow.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/WifiDialogs/WifiNetworksWindow.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/WifiDialogs/WifiStatusDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/WifiDialogs/WifiStatusDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/WifiDialogs/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/WifiDialogs/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MicroPython/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MicroPython/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MultiProject/AddProjectDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MultiProject/AddProjectDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2008 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2008 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MultiProject/MultiProject.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MultiProject/MultiProject.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2008 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2008 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MultiProject/MultiProjectBrowser.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MultiProject/MultiProjectBrowser.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2008 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2008 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MultiProject/MultiProjectFile.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MultiProject/MultiProjectFile.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MultiProject/MultiProjectProjectMeta.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MultiProject/MultiProjectProjectMeta.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MultiProject/PropertiesDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MultiProject/PropertiesDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2008 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2008 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/MultiProject/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/MultiProject/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2008 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2008 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Network/IRC/IrcChannelEditDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Network/IRC/IrcChannelEditDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Network/IRC/IrcChannelWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Network/IRC/IrcChannelWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Network/IRC/IrcIdentitiesEditDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Network/IRC/IrcIdentitiesEditDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Network/IRC/IrcMessageEdit.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Network/IRC/IrcMessageEdit.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Network/IRC/IrcNetworkEditDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Network/IRC/IrcNetworkEditDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Network/IRC/IrcNetworkListDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Network/IRC/IrcNetworkListDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Network/IRC/IrcNetworkManager.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Network/IRC/IrcNetworkManager.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Network/IRC/IrcNetworkWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Network/IRC/IrcNetworkWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Network/IRC/IrcServerEditDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Network/IRC/IrcServerEditDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Network/IRC/IrcUtilities.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Network/IRC/IrcUtilities.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Network/IRC/IrcWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Network/IRC/IrcWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Network/IRC/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Network/IRC/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Network/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Network/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/PdfViewer/PdfGoToDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/PdfViewer/PdfGoToDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/PdfViewer/PdfInfoWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/PdfViewer/PdfInfoWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/PdfViewer/PdfPageSelector.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/PdfViewer/PdfPageSelector.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/PdfViewer/PdfSearchWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/PdfViewer/PdfSearchWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/PdfViewer/PdfToCWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/PdfViewer/PdfToCWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/PdfViewer/PdfView.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/PdfViewer/PdfView.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/PdfViewer/PdfViewerWindow.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/PdfViewer/PdfViewerWindow.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/PdfViewer/PdfZoomSelector.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/PdfViewer/PdfZoomSelector.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/PdfViewer/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/PdfViewer/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/PipInterface/Pip.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/PipInterface/Pip.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -961,6 +961,7 @@ if callback: if self.__outdatedProc is not None: + self.__outdatedProc.finished.disconnect() self.__outdatedProc.kill() # end the process forcefully self.__outdatedProc = None @@ -972,10 +973,11 @@ proc.start(interpreter, args) return None - proc = QProcess() - proc.start(interpreter, args) - if proc.waitForStarted(15000) and proc.waitForFinished(30000): - packages = self.__extractOutdatedPackages(proc) + else: + proc = QProcess() + proc.start(interpreter, args) + if proc.waitForStarted(15000) and proc.waitForFinished(30000): + packages = self.__extractOutdatedPackages(proc) return packages @@ -1364,3 +1366,33 @@ licenses = json.loads(output) return licenses + + ####################################################################### + ## Cleanup of the site-packages directory in case pip updated or + ## removed packages currently in use. + ####################################################################### + + def runCleanup(self, envName): + """ + Public method to perform a cleanup run for a given environment. + + @param envName name of the environment to get the licenses for + @type str + @return flag indicating a successful removal. A missing environment + name or an undefined Python interpreter is treated as success + (i.e. nothing to do). + @rtype bool + """ + if envName: + interpreter = self.getVirtualenvInterpreter(envName) + if interpreter: + args = [os.path.join(os.path.dirname(__file__), "pipcleanup.py")] + + proc = QProcess() + proc.start(interpreter, args) + if proc.waitForStarted(15000) and proc.waitForFinished(30000): + return proc.exitCode() == 0 + + return False + + return True
--- a/src/eric7/PipInterface/PipDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/PipInterface/PipDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/PipInterface/PipFileSelectionDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/PipInterface/PipFileSelectionDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> #
--- a/src/eric7/PipInterface/PipFreezeDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/PipInterface/PipFreezeDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/PipInterface/PipLicensesDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/PipInterface/PipLicensesDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/PipInterface/PipPackageDetailsDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/PipInterface/PipPackageDetailsDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/PipInterface/PipPackagesInputDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/PipInterface/PipPackagesInputDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/PipInterface/PipPackagesWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/PipInterface/PipPackagesWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -9,16 +9,12 @@ import contextlib import enum -import html.parser import os -import textwrap from packaging.specifiers import InvalidSpecifier, SpecifierSet from PyQt6.QtCore import Qt, QUrl, QUrlQuery, pyqtSlot -from PyQt6.QtGui import QIcon -from PyQt6.QtNetwork import QNetworkReply, QNetworkRequest +from PyQt6.QtGui import QDesktopServices, QIcon from PyQt6.QtWidgets import ( - QAbstractItemView, QDialog, QHeaderView, QMenu, @@ -37,118 +33,6 @@ from .Ui_PipPackagesWidget import Ui_PipPackagesWidget -class PypiSearchResultsParser(html.parser.HTMLParser): - """ - Class implementing the parser for the PyPI search result page. - """ - - ClassPrefix = "package-snippet__" - - def __init__(self, data): - """ - Constructor - - @param data data to be parsed - @type str - """ - super().__init__() - self.__results = [] - self.__activeClass = None - self.feed(data) - - def __getClass(self, attrs): - """ - Private method to extract the class attribute out of the list of - attributes. - - @param attrs list of tag attributes as (name, value) tuples - @type list of tuple of (str, str) - @return value of the 'class' attribute or None - @rtype str - """ - for name, value in attrs: - if name == "class": - return value - - return None - - def __getDate(self, attrs): - """ - Private method to extract the datetime attribute out of the list of - attributes and process it. - - @param attrs list of tag attributes as (name, value) tuples - @type list of tuple of (str, str) - @return value of the 'class' attribute or None - @rtype str - """ - for name, value in attrs: - if name == "datetime": - return value.split("T")[0] - - return None - - def handle_starttag(self, tag, attrs): - """ - Public method to process the start tag. - - @param tag tag name (all lowercase) - @type str - @param attrs list of tag attributes as (name, value) tuples - @type list of tuple of (str, str) - """ - if tag == "a" and self.__getClass(attrs) == "package-snippet": - self.__results.append({}) - - if tag in ("span", "p"): - tagClass = self.__getClass(attrs) - if tagClass in ( - "package-snippet__name", - "package-snippet__description", - "package-snippet__version", - "package-snippet__released", - "package-snippet__created", - ): - self.__activeClass = tagClass - else: - self.__activeClass = None - elif tag == "time": - attributeName = self.__activeClass.replace(self.ClassPrefix, "") - self.__results[-1][attributeName] = self.__getDate(attrs) - self.__activeClass = None - else: - self.__activeClass = None - - def handle_data(self, data): - """ - Public method process arbitrary data. - - @param data data to be processed - @type str - """ - if self.__activeClass is not None: - attributeName = self.__activeClass.replace(self.ClassPrefix, "") - self.__results[-1][attributeName] = data - - def handle_endtag(self, _tag): - """ - Public method to process the end tag. - - @param _tag tag name (all lowercase) (unused) - @type str - """ - self.__activeClass = None - - def getResults(self): - """ - Public method to get the extracted search results. - - @return extracted result data - @rtype list of dict - """ - return self.__results - - class PipPackageInformationMode(enum.Enum): """ Class defining the show information process modes. @@ -203,17 +87,13 @@ self.pipMenuButton.setShowMenuInside(True) self.refreshButton.setIcon(EricPixmapCache.getIcon("reload")) + self.installButton.setIcon(EricPixmapCache.getIcon("plus")) self.upgradeButton.setIcon(EricPixmapCache.getIcon("1uparrow")) self.upgradeAllButton.setIcon(EricPixmapCache.getIcon("2uparrow")) self.uninstallButton.setIcon(EricPixmapCache.getIcon("minus")) self.showPackageDetailsButton.setIcon(EricPixmapCache.getIcon("info")) - self.searchToggleButton_1.setIcon(EricPixmapCache.getIcon("find")) - self.searchToggleButton_2.setIcon(EricPixmapCache.getIcon("find")) - self.searchButton.setIcon(EricPixmapCache.getIcon("findNext")) - self.searchMoreButton.setIcon(EricPixmapCache.getIcon("plus")) - self.installButton.setIcon(EricPixmapCache.getIcon("plus")) - self.installUserSiteButton.setIcon(EricPixmapCache.getIcon("addUser")) - self.showDetailsButton.setIcon(EricPixmapCache.getIcon("info")) + self.searchButton.setIcon(EricPixmapCache.getIcon("find")) + self.cleanupButton.setIcon(EricPixmapCache.getIcon("clear")) self.refreshDependenciesButton.setIcon(EricPixmapCache.getIcon("reload")) self.showDepPackageDetailsButton.setIcon(EricPixmapCache.getIcon("info")) @@ -262,13 +142,14 @@ self.__packageDetailsDialog = None + self.installButton.clicked.connect(self.__installPackages) + self.__initPipMenu() self.__populateEnvironments() self.__updateActionButtons() self.__updateDepActionButtons() self.statusLabel.hide() - self.searchWidget.hide() self.__lastSearchPage = 0 self.__queryName = [] @@ -425,17 +306,21 @@ Private method to set the state of the action buttons. """ if self.__isPipAvailable(): + self.installButton.setEnabled(True) self.upgradeButton.setEnabled(bool(self.__selectedUpdateableItems())) self.uninstallButton.setEnabled(bool(self.packagesList.selectedItems())) self.upgradeAllButton.setEnabled(bool(self.__allUpdateableItems())) self.showPackageDetailsButton.setEnabled( len(self.packagesList.selectedItems()) == 1 ) + self.cleanupButton.setEnabled(True) else: + self.installButton.setEnabled(False) self.upgradeButton.setEnabled(False) self.uninstallButton.setEnabled(False) self.upgradeAllButton.setEnabled(False) self.showPackageDetailsButton.setEnabled(False) + self.cleanupButton.setEnabled(False) def __refreshPackagesList(self): """ @@ -488,9 +373,6 @@ else: self.__updateActionButtons() - self.__updateSearchActionButtons() - self.__updateSearchButton() - self.__updateSearchMoreButton(False) def __updateOutdatedInfo(self, outdatedPackages): """ @@ -512,9 +394,6 @@ ) self.__updateActionButtons() - self.__updateSearchActionButtons() - self.__updateSearchButton() - self.__updateSearchMoreButton(False) self.statusLabel.hide() @@ -531,12 +410,8 @@ self.environmentPathLabel.setPath( self.__pip.getVirtualenvInterpreter(name) ) - self.searchNameEdit.setEnabled(True) else: self.environmentPathLabel.setPath("") - self.searchNameEdit.clear() - self.searchNameEdit.setEnabled(False) - self.searchResultList.clear() if self.__packageDetailsDialog is not None: self.__packageDetailsDialog.close() @@ -546,6 +421,8 @@ self.__refreshPackagesList() self.__selectedEnvironment = name + self.__updateActionButtons() + @pyqtSlot() def on_localCheckBox_clicked(self): """ @@ -837,291 +714,53 @@ upgradable=upgradable, ) - ####################################################################### - ## Search widget related methods below - ####################################################################### - - def __updateSearchActionButtons(self): - """ - Private method to update the action button states of the search widget. + @pyqtSlot() + def on_cleanupButton_clicked(self): """ - installEnable = ( - len(self.searchResultList.selectedItems()) > 0 - and self.environmentsComboBox.currentIndex() > 0 - and self.__isPipAvailable() - ) - self.installButton.setEnabled(installEnable) - self.installUserSiteButton.setEnabled(installEnable) - - self.showDetailsButton.setEnabled( - len(self.searchResultList.selectedItems()) == 1 and self.__isPipAvailable() - ) - - def __updateSearchButton(self): - """ - Private method to update the state of the search button. - """ - self.searchButton.setEnabled( - bool(self.searchNameEdit.text()) and self.__isPipAvailable() - ) - - def __updateSearchMoreButton(self, enable): - """ - Private method to update the state of the search more button. - - @param enable flag indicating the desired enable state - @type bool - """ - self.searchMoreButton.setEnabled( - enable and bool(self.searchNameEdit.text()) and self.__isPipAvailable() - ) - - @pyqtSlot(bool) - def on_searchToggleButton_1_toggled(self, checked): + Private slot to cleanup the site-packages directory of the selected + environment. """ - Private slot to toggle the search widget. - - @param checked state of the search widget button - @type bool - """ - self.searchWidget.setVisible(checked) - self.searchToggleButton_2.setChecked(checked) - - if checked: - self.searchNameEdit.setFocus(Qt.FocusReason.OtherFocusReason) - self.searchNameEdit.selectAll() - - self.__updateSearchActionButtons() - self.__updateSearchButton() - self.__updateSearchMoreButton(False) - - @pyqtSlot(bool) - def on_searchToggleButton_2_toggled(self, checked): - """ - Private slot to toggle the search widget. - - @param checked state of the search widget button - @type bool - """ - self.searchToggleButton_1.setChecked(checked) - - @pyqtSlot(str) - def on_searchNameEdit_textChanged(self, _txt): - """ - Private slot handling a change of the search term. - - @param _txt search term (unused) - @type str - """ - self.__updateSearchButton() - - @pyqtSlot() - def on_searchNameEdit_returnPressed(self): - """ - Private slot initiating a search via a press of the Return key. - """ - if bool(self.searchNameEdit.text()) and self.__isPipAvailable(): - self.__searchFirst() + envName = self.environmentsComboBox.currentText() + if envName: + ok = self.__pip.runCleanup(envName=envName) + if ok: + EricMessageBox.information( + self, + self.tr("Cleanup Environment"), + self.tr("The environment cleanup was successful."), + ) + else: + EricMessageBox.warning( + self, + self.tr("Cleanup Environment"), + self.tr( + "Some leftover package directories could not been removed." + " Delete them manually." + ), + ) @pyqtSlot() def on_searchButton_clicked(self): """ - Private slot handling a press of the search button. + Private slot to open a web browser for package searching. """ - self.__searchFirst() + url = QUrl(self.__pip.getIndexUrlSearch()) - @pyqtSlot() - def on_searchMoreButton_clicked(self): - """ - Private slot handling a press of the search more button. - """ - self.__search(self.__lastSearchPage + 1) + searchTerm = self.searchEdit.text().strip() + if searchTerm: + searchTerm = bytes(QUrl.toPercentEncoding(searchTerm)).decode() + urlQuery = QUrlQuery() + urlQuery.addQueryItem("q", searchTerm) + url.setQuery(urlQuery) + + QDesktopServices.openUrl(url) @pyqtSlot() - def on_searchResultList_itemSelectionChanged(self): - """ - Private slot handling changes of the search result selection. - """ - self.__updateSearchActionButtons() - - def __searchFirst(self): - """ - Private method to perform the search for packages. - """ - self.searchResultList.clear() - self.searchInfoLabel.clear() - - self.__updateSearchMoreButton(False) - - self.__search() - - def __search(self, page=1): - """ - Private method to perform the search by calling the PyPI search URL. - - @param page search page to retrieve (defaults to 1) - @type int (optional) - """ - self.__lastSearchPage = page - - self.searchButton.setEnabled(False) - - searchTerm = self.searchNameEdit.text().strip() - searchTerm = bytes(QUrl.toPercentEncoding(searchTerm)).decode() - urlQuery = QUrlQuery() - urlQuery.addQueryItem("q", searchTerm) - urlQuery.addQueryItem("page", str(page)) - url = QUrl(self.__pip.getIndexUrlSearch()) - url.setQuery(urlQuery) - - request = QNetworkRequest(QUrl(url)) - request.setAttribute( - QNetworkRequest.Attribute.CacheLoadControlAttribute, - QNetworkRequest.CacheLoadControl.AlwaysNetwork, - ) - reply = self.__pip.getNetworkAccessManager().get(request) - reply.finished.connect(lambda: self.__searchResponse(reply)) - self.__replies.append(reply) - - def __searchResponse(self, reply): - """ - Private method to extract the search result data from the response. - - @param reply reference to the reply object containing the data - @type QNetworkReply + def on_searchEdit_returnPressed(self): """ - if reply in self.__replies: - self.__replies.remove(reply) - - urlQuery = QUrlQuery(reply.url()) - searchTerm = urlQuery.queryItemValue("q") - - if reply.error() != QNetworkReply.NetworkError.NoError: - EricMessageBox.warning( - None, - self.tr("Search PyPI"), - self.tr( - "<p>Received an error while searching for <b>{0}</b>.</p>" - "<p>Error: {1}</p>" - ).format(searchTerm, reply.errorString()), - ) - reply.deleteLater() - return - - data = bytes(reply.readAll()).decode() - reply.deleteLater() - - results = PypiSearchResultsParser(data).getResults() - if results: - # PyPI returns max. 20 entries per page - if len(results) < 20: - msg = self.tr( - "%n package(s) found.", - "", - (self.__lastSearchPage - 1) * 20 + len(results), - ) - self.__updateSearchMoreButton(False) - else: - msg = self.tr("Showing first {0} packages found.").format( - self.__lastSearchPage * 20 - ) - self.__updateSearchMoreButton(True) - self.searchInfoLabel.setText(msg) - lastItem = self.searchResultList.topLevelItem( - self.searchResultList.topLevelItemCount() - 1 - ) - else: - self.__updateSearchMoreButton(False) - if self.__lastSearchPage == 1: - EricMessageBox.warning( - self, - self.tr("Search PyPI"), - self.tr("""<p>There were no results for <b>{0}</b>.</p>""").format( - searchTerm - ), - ) - self.searchInfoLabel.setText( - self.tr("""<p>There were no results for <b>{0}</b>.</p>""").format( - searchTerm - ) - ) - else: - EricMessageBox.warning( - self, - self.tr("Search PyPI"), - self.tr( - """<p>There were no more results for <b>{0}</b>.</p>""" - ).format(searchTerm), - ) - lastItem = None - - wrapper = textwrap.TextWrapper(width=80) - for result in results: - try: - description = "\n".join( - [ - wrapper.fill(line) - for line in result["description"].strip().splitlines() - ] - ) - except KeyError: - description = "" - date = result["released"] if "released" in result else result["created"] - itm = QTreeWidgetItem( - self.searchResultList, - [ - result["name"].strip(), - result["version"], - date.strip(), - description, - ], - ) - itm.setData(0, self.SearchVersionRole, result["version"]) - - if lastItem: - self.searchResultList.scrollToItem( - lastItem, QAbstractItemView.ScrollHint.PositionAtTop - ) - - header = self.searchResultList.header() - header.setStretchLastSection(False) - header.resizeSections(QHeaderView.ResizeMode.ResizeToContents) - headerSize = 0 - for col in range(header.count()): - headerSize += header.sectionSize(col) - if headerSize < header.width(): - header.setStretchLastSection(True) - - self.__finishSearch() - - def __finishSearch(self): + Private slot to handle the press of the Return key in the search line edit. """ - Private slot performing the search finishing actions. - """ - self.__updateSearchActionButtons() - self.__updateSearchButton() - - self.searchNameEdit.setFocus(Qt.FocusReason.OtherFocusReason) - - @pyqtSlot() - def on_installButton_clicked(self): - """ - Private slot to handle pressing the Install button.. - """ - packages = [ - itm.text(0).strip() for itm in self.searchResultList.selectedItems() - ] - self.executeInstallPackages(packages) - - @pyqtSlot() - def on_installUserSiteButton_clicked(self): - """ - Private slot to handle pressing the Install to User-Site button.. - """ - packages = [ - itm.text(0).strip() for itm in self.searchResultList.selectedItems() - ] - self.executeInstallPackages(packages, userSite=True) + self.on_searchButton_clicked() def executeInstallPackages(self, packages, userSite=False): """ @@ -1137,42 +776,6 @@ self.__pip.installPackages(packages, venvName=venvName, userSite=userSite) self.on_refreshButton_clicked() - @pyqtSlot() - def on_showDetailsButton_clicked(self): - """ - Private slot to handle pressing the Show Details button. - """ - self.__showSearchedDetails() - - @pyqtSlot(QTreeWidgetItem, int) - def on_searchResultList_itemActivated(self, item, column): - """ - Private slot reacting on an search result item activation. - - @param item reference to the activated item - @type QTreeWidgetItem - @param column activated column - @type int - """ - self.__showSearchedDetails(item) - - def __showSearchedDetails(self, item=None): - """ - Private slot to show details about the selected search result package. - - @param item reference to the search result item to show details for - @type QTreeWidgetItem - """ - self.showDetailsButton.setEnabled(False) - - if not item: - item = self.searchResultList.selectedItems()[0] - - packageVersion = item.data(0, self.SearchVersionRole) - packageName = item.text(0) - - self.__showPackageDetails(packageName, packageVersion, installable=True) - def __showPackageDetails( self, packageName, @@ -1203,8 +806,6 @@ packageData = self.__pip.getPackageDetails(packageName, packageVersion) if packageData: - self.showDetailsButton.setEnabled(True) - if installable: buttonsMode = PipPackageDetailsDialog.ButtonInstall elif upgradable:
--- a/src/eric7/PipInterface/PipPackagesWidget.ui Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/PipInterface/PipPackagesWidget.ui Tue Jan 14 17:29:56 2025 +0100 @@ -10,7 +10,7 @@ <height>999</height> </rect> </property> - <layout class="QVBoxLayout" name="verticalLayout_8"> + <layout class="QVBoxLayout" name="verticalLayout"> <item> <layout class="QHBoxLayout" name="horizontalLayout"> <item> @@ -29,7 +29,7 @@ <item> <widget class="EricToolButton" name="pipMenuButton"> <property name="popupMode"> - <enum>QToolButton::InstantPopup</enum> + <enum>QToolButton::ToolButtonPopupMode::InstantPopup</enum> </property> </widget> </item> @@ -45,7 +45,7 @@ <item> <widget class="Line" name="line"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> </widget> </item> @@ -69,196 +69,6 @@ <number>0</number> </property> <item> - <widget class="QWidget" name="searchWidget" native="true"> - <layout class="QVBoxLayout" name="verticalLayout_2"> - <property name="leftMargin"> - <number>0</number> - </property> - <property name="topMargin"> - <number>0</number> - </property> - <property name="rightMargin"> - <number>0</number> - </property> - <property name="bottomMargin"> - <number>0</number> - </property> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_3"> - <item> - <spacer name="horizontalSpacer_3"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="QToolButton" name="installButton"> - <property name="toolTip"> - <string>Press to install the selected package</string> - </property> - </widget> - </item> - <item> - <widget class="QToolButton" name="installUserSiteButton"> - <property name="toolTip"> - <string>Press to install the selected package to the user site</string> - </property> - </widget> - </item> - <item> - <widget class="QToolButton" name="showDetailsButton"> - <property name="toolTip"> - <string>Press to show details for the selected entry</string> - </property> - </widget> - </item> - <item> - <spacer name="horizontalSpacer_4"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="QToolButton" name="searchToggleButton_2"> - <property name="toolTip"> - <string>Toggle to show or hide the search window</string> - </property> - <property name="checkable"> - <bool>true</bool> - </property> - </widget> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_8"> - <item> - <widget class="QLabel" name="label"> - <property name="text"> - <string>Package</string> - </property> - </widget> - </item> - <item> - <widget class="QLineEdit" name="searchNameEdit"> - <property name="toolTip"> - <string>Enter the search term for the package name</string> - </property> - <property name="placeholderText"> - <string>Enter search term</string> - </property> - </widget> - </item> - <item> - <widget class="QToolButton" name="searchButton"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="toolTip"> - <string>Press to start the search</string> - </property> - </widget> - </item> - <item> - <widget class="QToolButton" name="searchMoreButton"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="toolTip"> - <string>Press to search for more packages</string> - </property> - </widget> - </item> - </layout> - </item> - <item> - <widget class="QWidget" name="searchOptionsWidget" native="true"> - <layout class="QVBoxLayout" name="verticalLayout"> - <property name="leftMargin"> - <number>0</number> - </property> - <property name="topMargin"> - <number>0</number> - </property> - <property name="rightMargin"> - <number>0</number> - </property> - <property name="bottomMargin"> - <number>0</number> - </property> - </layout> - </widget> - </item> - <item> - <widget class="QTreeWidget" name="searchResultList"> - <property name="alternatingRowColors"> - <bool>true</bool> - </property> - <property name="selectionMode"> - <enum>QAbstractItemView::ExtendedSelection</enum> - </property> - <property name="rootIsDecorated"> - <bool>false</bool> - </property> - <property name="itemsExpandable"> - <bool>false</bool> - </property> - <property name="allColumnsShowFocus"> - <bool>true</bool> - </property> - <property name="wordWrap"> - <bool>true</bool> - </property> - <column> - <property name="text"> - <string>Package</string> - </property> - </column> - <column> - <property name="text"> - <string>Version</string> - </property> - </column> - <column> - <property name="text"> - <string>Released</string> - </property> - </column> - <column> - <property name="text"> - <string>Description</string> - </property> - </column> - </widget> - </item> - <item> - <widget class="QLabel" name="searchInfoLabel"/> - </item> - <item> - <widget class="Line" name="line_2"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> <widget class="QWidget" name="baseWidget" native="true"> <layout class="QVBoxLayout" name="verticalLayout_6"> <property name="leftMargin"> @@ -278,7 +88,7 @@ <item> <spacer name="horizontalSpacer"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <property name="sizeHint" stdset="0"> <size> @@ -296,6 +106,13 @@ </widget> </item> <item> + <widget class="QToolButton" name="installButton"> + <property name="toolTip"> + <string>Press to install a package.</string> + </property> + </widget> + </item> + <item> <widget class="QToolButton" name="upgradeButton"> <property name="toolTip"> <string>Press to upgrade the selected packages</string> @@ -324,9 +141,23 @@ </widget> </item> <item> + <widget class="Line" name="line_3"> + <property name="orientation"> + <enum>Qt::Orientation::Vertical</enum> + </property> + </widget> + </item> + <item> + <widget class="QToolButton" name="cleanupButton"> + <property name="toolTip"> + <string>Press to remove leftovers of an upgrade or uninstall run.</string> + </property> + </widget> + </item> + <item> <spacer name="horizontalSpacer_2"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <property name="sizeHint" stdset="0"> <size> @@ -336,16 +167,6 @@ </property> </spacer> </item> - <item> - <widget class="QToolButton" name="searchToggleButton_1"> - <property name="toolTip"> - <string>Toggle to show or hide the search window</string> - </property> - <property name="checkable"> - <bool>true</bool> - </property> - </widget> - </item> </layout> </item> <item> @@ -404,7 +225,7 @@ <item> <widget class="QSplitter" name="splitter"> <property name="orientation"> - <enum>Qt::Vertical</enum> + <enum>Qt::Orientation::Vertical</enum> </property> <property name="childrenCollapsible"> <bool>false</bool> @@ -420,7 +241,7 @@ <bool>true</bool> </property> <property name="selectionMode"> - <enum>QAbstractItemView::ExtendedSelection</enum> + <enum>QAbstractItemView::SelectionMode::ExtendedSelection</enum> </property> <property name="rootIsDecorated"> <bool>false</bool> @@ -500,7 +321,7 @@ <bool>true</bool> </property> <property name="selectionBehavior"> - <enum>QAbstractItemView::SelectItems</enum> + <enum>QAbstractItemView::SelectionBehavior::SelectItems</enum> </property> <property name="rootIsDecorated"> <bool>false</bool> @@ -554,7 +375,7 @@ <bool>true</bool> </property> <property name="selectionBehavior"> - <enum>QAbstractItemView::SelectItems</enum> + <enum>QAbstractItemView::SelectionBehavior::SelectItems</enum> </property> <property name="rootIsDecorated"> <bool>false</bool> @@ -618,7 +439,7 @@ <item> <spacer name="horizontalSpacer_5"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <property name="sizeHint" stdset="0"> <size> @@ -662,7 +483,7 @@ <item> <spacer name="horizontalSpacer_6"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <property name="sizeHint" stdset="0"> <size> @@ -736,7 +557,7 @@ <item> <widget class="QSplitter" name="splitter_2"> <property name="orientation"> - <enum>Qt::Vertical</enum> + <enum>Qt::Orientation::Vertical</enum> </property> <widget class="QTreeWidget" name="dependenciesList"> <property name="sizePolicy"> @@ -749,7 +570,7 @@ <bool>true</bool> </property> <property name="selectionMode"> - <enum>QAbstractItemView::ExtendedSelection</enum> + <enum>QAbstractItemView::SelectionMode::ExtendedSelection</enum> </property> <property name="sortingEnabled"> <bool>true</bool> @@ -824,6 +645,38 @@ </widget> </widget> </item> + <item> + <widget class="Line" name="line_2"> + <property name="orientation"> + <enum>Qt::Orientation::Horizontal</enum> + </property> + </widget> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_3"> + <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Search Package:</string> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="searchEdit"> + <property name="toolTip"> + <string>Enter package name to search for.</string> + </property> + </widget> + </item> + <item> + <widget class="QToolButton" name="searchButton"> + <property name="toolTip"> + <string>Press to open a web browser for searching.</string> + </property> + </widget> + </item> + </layout> + </item> </layout> </widget> <customwidgets> @@ -843,11 +696,12 @@ <tabstop>environmentsComboBox</tabstop> <tabstop>pipMenuButton</tabstop> <tabstop>refreshButton</tabstop> + <tabstop>installButton</tabstop> <tabstop>upgradeButton</tabstop> <tabstop>upgradeAllButton</tabstop> <tabstop>uninstallButton</tabstop> <tabstop>showPackageDetailsButton</tabstop> - <tabstop>searchToggleButton_1</tabstop> + <tabstop>cleanupButton</tabstop> <tabstop>localCheckBox</tabstop> <tabstop>notRequiredCheckBox</tabstop> <tabstop>userCheckBox</tabstop> @@ -858,14 +712,6 @@ <tabstop>installedFilesCheckBox</tabstop> <tabstop>packageInfoWidget</tabstop> <tabstop>vulnerabilitiesInfoWidget</tabstop> - <tabstop>installButton</tabstop> - <tabstop>installUserSiteButton</tabstop> - <tabstop>showDetailsButton</tabstop> - <tabstop>searchToggleButton_2</tabstop> - <tabstop>searchNameEdit</tabstop> - <tabstop>searchButton</tabstop> - <tabstop>searchMoreButton</tabstop> - <tabstop>searchResultList</tabstop> <tabstop>refreshDependenciesButton</tabstop> <tabstop>showDepPackageDetailsButton</tabstop> <tabstop>dependencyRepairButton</tabstop> @@ -876,6 +722,8 @@ <tabstop>userDepCheckBox</tabstop> <tabstop>dependenciesList</tabstop> <tabstop>dependencyInfoWidget</tabstop> + <tabstop>searchEdit</tabstop> + <tabstop>searchButton</tabstop> </tabstops> <resources/> <connections/>
--- a/src/eric7/PipInterface/PipPackagesWindow.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/PipInterface/PipPackagesWindow.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/PipInterface/PipVulnerabilityChecker.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/PipInterface/PipVulnerabilityChecker.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/PipInterface/Ui_PipPackagesWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/PipInterface/Ui_PipPackagesWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # Form implementation generated from reading ui file 'src/eric7/PipInterface/PipPackagesWidget.ui' # -# Created by: PyQt6 UI code generator 6.7.0 +# Created by: PyQt6 UI code generator 6.8.0 # # WARNING: Any manual changes made to this file will be lost when pyuic6 is # run again. Do not edit this file unless you know what you are doing. @@ -13,8 +13,8 @@ def setupUi(self, PipPackagesWidget): PipPackagesWidget.setObjectName("PipPackagesWidget") PipPackagesWidget.resize(500, 999) - self.verticalLayout_8 = QtWidgets.QVBoxLayout(PipPackagesWidget) - self.verticalLayout_8.setObjectName("verticalLayout_8") + self.verticalLayout = QtWidgets.QVBoxLayout(PipPackagesWidget) + self.verticalLayout.setObjectName("verticalLayout") self.horizontalLayout = QtWidgets.QHBoxLayout() self.horizontalLayout.setObjectName("horizontalLayout") self.viewToggleButton = QtWidgets.QToolButton(parent=PipPackagesWidget) @@ -28,16 +28,16 @@ self.pipMenuButton.setPopupMode(QtWidgets.QToolButton.ToolButtonPopupMode.InstantPopup) self.pipMenuButton.setObjectName("pipMenuButton") self.horizontalLayout.addWidget(self.pipMenuButton) - self.verticalLayout_8.addLayout(self.horizontalLayout) + self.verticalLayout.addLayout(self.horizontalLayout) self.environmentPathLabel = EricSqueezeLabelPath(parent=PipPackagesWidget) self.environmentPathLabel.setText("") self.environmentPathLabel.setObjectName("environmentPathLabel") - self.verticalLayout_8.addWidget(self.environmentPathLabel) + self.verticalLayout.addWidget(self.environmentPathLabel) self.line = QtWidgets.QFrame(parent=PipPackagesWidget) self.line.setFrameShape(QtWidgets.QFrame.Shape.HLine) self.line.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken) self.line.setObjectName("line") - self.verticalLayout_8.addWidget(self.line) + self.verticalLayout.addWidget(self.line) self.viewsStackWidget = QtWidgets.QStackedWidget(parent=PipPackagesWidget) self.viewsStackWidget.setObjectName("viewsStackWidget") self.packagesPage = QtWidgets.QWidget() @@ -45,72 +45,6 @@ self.verticalLayout_5 = QtWidgets.QVBoxLayout(self.packagesPage) self.verticalLayout_5.setContentsMargins(0, 0, 0, 0) self.verticalLayout_5.setObjectName("verticalLayout_5") - self.searchWidget = QtWidgets.QWidget(parent=self.packagesPage) - self.searchWidget.setObjectName("searchWidget") - self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.searchWidget) - self.verticalLayout_2.setContentsMargins(0, 0, 0, 0) - self.verticalLayout_2.setObjectName("verticalLayout_2") - self.horizontalLayout_3 = QtWidgets.QHBoxLayout() - self.horizontalLayout_3.setObjectName("horizontalLayout_3") - spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) - self.horizontalLayout_3.addItem(spacerItem) - self.installButton = QtWidgets.QToolButton(parent=self.searchWidget) - self.installButton.setObjectName("installButton") - self.horizontalLayout_3.addWidget(self.installButton) - self.installUserSiteButton = QtWidgets.QToolButton(parent=self.searchWidget) - self.installUserSiteButton.setObjectName("installUserSiteButton") - self.horizontalLayout_3.addWidget(self.installUserSiteButton) - self.showDetailsButton = QtWidgets.QToolButton(parent=self.searchWidget) - self.showDetailsButton.setObjectName("showDetailsButton") - self.horizontalLayout_3.addWidget(self.showDetailsButton) - spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) - self.horizontalLayout_3.addItem(spacerItem1) - self.searchToggleButton_2 = QtWidgets.QToolButton(parent=self.searchWidget) - self.searchToggleButton_2.setCheckable(True) - self.searchToggleButton_2.setObjectName("searchToggleButton_2") - self.horizontalLayout_3.addWidget(self.searchToggleButton_2) - self.verticalLayout_2.addLayout(self.horizontalLayout_3) - self.horizontalLayout_8 = QtWidgets.QHBoxLayout() - self.horizontalLayout_8.setObjectName("horizontalLayout_8") - self.label = QtWidgets.QLabel(parent=self.searchWidget) - self.label.setObjectName("label") - self.horizontalLayout_8.addWidget(self.label) - self.searchNameEdit = QtWidgets.QLineEdit(parent=self.searchWidget) - self.searchNameEdit.setObjectName("searchNameEdit") - self.horizontalLayout_8.addWidget(self.searchNameEdit) - self.searchButton = QtWidgets.QToolButton(parent=self.searchWidget) - self.searchButton.setEnabled(False) - self.searchButton.setObjectName("searchButton") - self.horizontalLayout_8.addWidget(self.searchButton) - self.searchMoreButton = QtWidgets.QToolButton(parent=self.searchWidget) - self.searchMoreButton.setEnabled(False) - self.searchMoreButton.setObjectName("searchMoreButton") - self.horizontalLayout_8.addWidget(self.searchMoreButton) - self.verticalLayout_2.addLayout(self.horizontalLayout_8) - self.searchOptionsWidget = QtWidgets.QWidget(parent=self.searchWidget) - self.searchOptionsWidget.setObjectName("searchOptionsWidget") - self.verticalLayout = QtWidgets.QVBoxLayout(self.searchOptionsWidget) - self.verticalLayout.setContentsMargins(0, 0, 0, 0) - self.verticalLayout.setObjectName("verticalLayout") - self.verticalLayout_2.addWidget(self.searchOptionsWidget) - self.searchResultList = QtWidgets.QTreeWidget(parent=self.searchWidget) - self.searchResultList.setAlternatingRowColors(True) - self.searchResultList.setSelectionMode(QtWidgets.QAbstractItemView.SelectionMode.ExtendedSelection) - self.searchResultList.setRootIsDecorated(False) - self.searchResultList.setItemsExpandable(False) - self.searchResultList.setAllColumnsShowFocus(True) - self.searchResultList.setWordWrap(True) - self.searchResultList.setObjectName("searchResultList") - self.verticalLayout_2.addWidget(self.searchResultList) - self.searchInfoLabel = QtWidgets.QLabel(parent=self.searchWidget) - self.searchInfoLabel.setObjectName("searchInfoLabel") - self.verticalLayout_2.addWidget(self.searchInfoLabel) - self.line_2 = QtWidgets.QFrame(parent=self.searchWidget) - self.line_2.setFrameShape(QtWidgets.QFrame.Shape.HLine) - self.line_2.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken) - self.line_2.setObjectName("line_2") - self.verticalLayout_2.addWidget(self.line_2) - self.verticalLayout_5.addWidget(self.searchWidget) self.baseWidget = QtWidgets.QWidget(parent=self.packagesPage) self.baseWidget.setObjectName("baseWidget") self.verticalLayout_6 = QtWidgets.QVBoxLayout(self.baseWidget) @@ -118,11 +52,14 @@ self.verticalLayout_6.setObjectName("verticalLayout_6") self.horizontalLayout_2 = QtWidgets.QHBoxLayout() self.horizontalLayout_2.setObjectName("horizontalLayout_2") - spacerItem2 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) - self.horizontalLayout_2.addItem(spacerItem2) + spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + self.horizontalLayout_2.addItem(spacerItem) self.refreshButton = QtWidgets.QToolButton(parent=self.baseWidget) self.refreshButton.setObjectName("refreshButton") self.horizontalLayout_2.addWidget(self.refreshButton) + self.installButton = QtWidgets.QToolButton(parent=self.baseWidget) + self.installButton.setObjectName("installButton") + self.horizontalLayout_2.addWidget(self.installButton) self.upgradeButton = QtWidgets.QToolButton(parent=self.baseWidget) self.upgradeButton.setObjectName("upgradeButton") self.horizontalLayout_2.addWidget(self.upgradeButton) @@ -135,12 +72,16 @@ self.showPackageDetailsButton = QtWidgets.QToolButton(parent=self.baseWidget) self.showPackageDetailsButton.setObjectName("showPackageDetailsButton") self.horizontalLayout_2.addWidget(self.showPackageDetailsButton) - spacerItem3 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) - self.horizontalLayout_2.addItem(spacerItem3) - self.searchToggleButton_1 = QtWidgets.QToolButton(parent=self.baseWidget) - self.searchToggleButton_1.setCheckable(True) - self.searchToggleButton_1.setObjectName("searchToggleButton_1") - self.horizontalLayout_2.addWidget(self.searchToggleButton_1) + self.line_3 = QtWidgets.QFrame(parent=self.baseWidget) + self.line_3.setFrameShape(QtWidgets.QFrame.Shape.VLine) + self.line_3.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken) + self.line_3.setObjectName("line_3") + self.horizontalLayout_2.addWidget(self.line_3) + self.cleanupButton = QtWidgets.QToolButton(parent=self.baseWidget) + self.cleanupButton.setObjectName("cleanupButton") + self.horizontalLayout_2.addWidget(self.cleanupButton) + spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + self.horizontalLayout_2.addItem(spacerItem1) self.verticalLayout_6.addLayout(self.horizontalLayout_2) self.gridLayout_2 = QtWidgets.QGridLayout() self.gridLayout_2.setObjectName("gridLayout_2") @@ -247,8 +188,8 @@ self.verticalLayout_7.setObjectName("verticalLayout_7") self.horizontalLayout_6 = QtWidgets.QHBoxLayout() self.horizontalLayout_6.setObjectName("horizontalLayout_6") - spacerItem4 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) - self.horizontalLayout_6.addItem(spacerItem4) + spacerItem2 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + self.horizontalLayout_6.addItem(spacerItem2) self.refreshDependenciesButton = QtWidgets.QToolButton(parent=self.dependenciesPage) self.refreshDependenciesButton.setObjectName("refreshDependenciesButton") self.horizontalLayout_6.addWidget(self.refreshDependenciesButton) @@ -262,8 +203,8 @@ self.dependencyRepairAllButton = QtWidgets.QToolButton(parent=self.dependenciesPage) self.dependencyRepairAllButton.setObjectName("dependencyRepairAllButton") self.horizontalLayout_6.addWidget(self.dependencyRepairAllButton) - spacerItem5 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) - self.horizontalLayout_6.addItem(spacerItem5) + spacerItem3 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + self.horizontalLayout_6.addItem(spacerItem3) self.verticalLayout_7.addLayout(self.horizontalLayout_6) self.groupBox = QtWidgets.QGroupBox(parent=self.dependenciesPage) self.groupBox.setObjectName("groupBox") @@ -320,7 +261,24 @@ self.dependencyInfoWidget.header().setStretchLastSection(False) self.verticalLayout_7.addWidget(self.splitter_2) self.viewsStackWidget.addWidget(self.dependenciesPage) - self.verticalLayout_8.addWidget(self.viewsStackWidget) + self.verticalLayout.addWidget(self.viewsStackWidget) + self.line_2 = QtWidgets.QFrame(parent=PipPackagesWidget) + self.line_2.setFrameShape(QtWidgets.QFrame.Shape.HLine) + self.line_2.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken) + self.line_2.setObjectName("line_2") + self.verticalLayout.addWidget(self.line_2) + self.horizontalLayout_3 = QtWidgets.QHBoxLayout() + self.horizontalLayout_3.setObjectName("horizontalLayout_3") + self.label = QtWidgets.QLabel(parent=PipPackagesWidget) + self.label.setObjectName("label") + self.horizontalLayout_3.addWidget(self.label) + self.searchEdit = QtWidgets.QLineEdit(parent=PipPackagesWidget) + self.searchEdit.setObjectName("searchEdit") + self.horizontalLayout_3.addWidget(self.searchEdit) + self.searchButton = QtWidgets.QToolButton(parent=PipPackagesWidget) + self.searchButton.setObjectName("searchButton") + self.horizontalLayout_3.addWidget(self.searchButton) + self.verticalLayout.addLayout(self.horizontalLayout_3) self.retranslateUi(PipPackagesWidget) self.viewsStackWidget.setCurrentIndex(0) @@ -329,12 +287,13 @@ PipPackagesWidget.setTabOrder(self.viewToggleButton, self.environmentsComboBox) PipPackagesWidget.setTabOrder(self.environmentsComboBox, self.pipMenuButton) PipPackagesWidget.setTabOrder(self.pipMenuButton, self.refreshButton) - PipPackagesWidget.setTabOrder(self.refreshButton, self.upgradeButton) + PipPackagesWidget.setTabOrder(self.refreshButton, self.installButton) + PipPackagesWidget.setTabOrder(self.installButton, self.upgradeButton) PipPackagesWidget.setTabOrder(self.upgradeButton, self.upgradeAllButton) PipPackagesWidget.setTabOrder(self.upgradeAllButton, self.uninstallButton) PipPackagesWidget.setTabOrder(self.uninstallButton, self.showPackageDetailsButton) - PipPackagesWidget.setTabOrder(self.showPackageDetailsButton, self.searchToggleButton_1) - PipPackagesWidget.setTabOrder(self.searchToggleButton_1, self.localCheckBox) + PipPackagesWidget.setTabOrder(self.showPackageDetailsButton, self.cleanupButton) + PipPackagesWidget.setTabOrder(self.cleanupButton, self.localCheckBox) PipPackagesWidget.setTabOrder(self.localCheckBox, self.notRequiredCheckBox) PipPackagesWidget.setTabOrder(self.notRequiredCheckBox, self.userCheckBox) PipPackagesWidget.setTabOrder(self.userCheckBox, self.vulnerabilityCheckBox) @@ -344,15 +303,7 @@ PipPackagesWidget.setTabOrder(self.verboseCheckBox, self.installedFilesCheckBox) PipPackagesWidget.setTabOrder(self.installedFilesCheckBox, self.packageInfoWidget) PipPackagesWidget.setTabOrder(self.packageInfoWidget, self.vulnerabilitiesInfoWidget) - PipPackagesWidget.setTabOrder(self.vulnerabilitiesInfoWidget, self.installButton) - PipPackagesWidget.setTabOrder(self.installButton, self.installUserSiteButton) - PipPackagesWidget.setTabOrder(self.installUserSiteButton, self.showDetailsButton) - PipPackagesWidget.setTabOrder(self.showDetailsButton, self.searchToggleButton_2) - PipPackagesWidget.setTabOrder(self.searchToggleButton_2, self.searchNameEdit) - PipPackagesWidget.setTabOrder(self.searchNameEdit, self.searchButton) - PipPackagesWidget.setTabOrder(self.searchButton, self.searchMoreButton) - PipPackagesWidget.setTabOrder(self.searchMoreButton, self.searchResultList) - PipPackagesWidget.setTabOrder(self.searchResultList, self.refreshDependenciesButton) + PipPackagesWidget.setTabOrder(self.vulnerabilitiesInfoWidget, self.refreshDependenciesButton) PipPackagesWidget.setTabOrder(self.refreshDependenciesButton, self.showDepPackageDetailsButton) PipPackagesWidget.setTabOrder(self.showDepPackageDetailsButton, self.dependencyRepairButton) PipPackagesWidget.setTabOrder(self.dependencyRepairButton, self.dependencyRepairAllButton) @@ -362,29 +313,19 @@ PipPackagesWidget.setTabOrder(self.localDepCheckBox, self.userDepCheckBox) PipPackagesWidget.setTabOrder(self.userDepCheckBox, self.dependenciesList) PipPackagesWidget.setTabOrder(self.dependenciesList, self.dependencyInfoWidget) + PipPackagesWidget.setTabOrder(self.dependencyInfoWidget, self.searchEdit) + PipPackagesWidget.setTabOrder(self.searchEdit, self.searchButton) def retranslateUi(self, PipPackagesWidget): _translate = QtCore.QCoreApplication.translate self.viewToggleButton.setToolTip(_translate("PipPackagesWidget", "Toggle to show or hide the dependency tree view")) - self.installButton.setToolTip(_translate("PipPackagesWidget", "Press to install the selected package")) - self.installUserSiteButton.setToolTip(_translate("PipPackagesWidget", "Press to install the selected package to the user site")) - self.showDetailsButton.setToolTip(_translate("PipPackagesWidget", "Press to show details for the selected entry")) - self.searchToggleButton_2.setToolTip(_translate("PipPackagesWidget", "Toggle to show or hide the search window")) - self.label.setText(_translate("PipPackagesWidget", "Package")) - self.searchNameEdit.setToolTip(_translate("PipPackagesWidget", "Enter the search term for the package name")) - self.searchNameEdit.setPlaceholderText(_translate("PipPackagesWidget", "Enter search term")) - self.searchButton.setToolTip(_translate("PipPackagesWidget", "Press to start the search")) - self.searchMoreButton.setToolTip(_translate("PipPackagesWidget", "Press to search for more packages")) - self.searchResultList.headerItem().setText(0, _translate("PipPackagesWidget", "Package")) - self.searchResultList.headerItem().setText(1, _translate("PipPackagesWidget", "Version")) - self.searchResultList.headerItem().setText(2, _translate("PipPackagesWidget", "Released")) - self.searchResultList.headerItem().setText(3, _translate("PipPackagesWidget", "Description")) self.refreshButton.setToolTip(_translate("PipPackagesWidget", "Press to refresh the lists")) + self.installButton.setToolTip(_translate("PipPackagesWidget", "Press to install a package.")) self.upgradeButton.setToolTip(_translate("PipPackagesWidget", "Press to upgrade the selected packages")) self.upgradeAllButton.setToolTip(_translate("PipPackagesWidget", "Press to upgrade all listed packages")) self.uninstallButton.setToolTip(_translate("PipPackagesWidget", "Press to uninstall the selected package")) self.showPackageDetailsButton.setToolTip(_translate("PipPackagesWidget", "Press to show details for the selected entry")) - self.searchToggleButton_1.setToolTip(_translate("PipPackagesWidget", "Toggle to show or hide the search window")) + self.cleanupButton.setToolTip(_translate("PipPackagesWidget", "Press to remove leftovers of an upgrade or uninstall run.")) self.localCheckBox.setToolTip(_translate("PipPackagesWidget", "Select to show only locally-installed packages")) self.localCheckBox.setText(_translate("PipPackagesWidget", "Local packages only")) self.notRequiredCheckBox.setToolTip(_translate("PipPackagesWidget", "Select to list packages that are not dependencies of installed packages")) @@ -421,5 +362,8 @@ self.dependenciesList.headerItem().setText(0, _translate("PipPackagesWidget", "Package")) self.dependenciesList.headerItem().setText(1, _translate("PipPackagesWidget", "Installed")) self.dependenciesList.headerItem().setText(2, _translate("PipPackagesWidget", "Required")) + self.label.setText(_translate("PipPackagesWidget", "Search Package:")) + self.searchEdit.setToolTip(_translate("PipPackagesWidget", "Enter package name to search for.")) + self.searchButton.setToolTip(_translate("PipPackagesWidget", "Press to open a web browser for searching.")) from eric7.EricWidgets.EricSqueezeLabels import EricSqueezeLabelPath from eric7.EricWidgets.EricToolButton import EricToolButton
--- a/src/eric7/PipInterface/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/PipInterface/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/PipInterface/pipcleanup.py Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,39 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- + +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +pipcleanup utility script. + +Script to delete all leftovers of upgrading packages currently in use. These +leftover directories are still located in the 'site-packages' directory and +their names start with a '~' character. +""" + +import glob +import os +import shutil +import sys +import sysconfig + + +def main(): + """ + Function implementing the main logic. + """ + sitepackages = sysconfig.get_path("platlib") + leftovers = glob.glob("~*", root_dir=sitepackages) + for leftover in leftovers: + directory = os.path.join(sitepackages, leftover) + print(f"Removing '{directory}'.") # noqa: M801 + shutil.rmtree(directory, ignore_errors=True) + + # check again for leftovers and report via exit code + leftovers = glob.glob("~*", root_dir=sitepackages) + sys.exit(1 if bool(leftovers) else 0) + + +if __name__ == "__main__": + main()
--- a/src/eric7/PipInterface/piplicenses.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/PipInterface/piplicenses.py Tue Jan 14 17:29:56 2025 +0100 @@ -30,7 +30,7 @@ # # Modified to be used within the eric-ide project. # -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # # Modifications: # - removed dependency to prettytable
--- a/src/eric7/PluginManager/PluginDetailsDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/PluginManager/PluginDetailsDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/PluginManager/PluginExceptions.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/PluginManager/PluginExceptions.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/PluginManager/PluginInfoDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/PluginManager/PluginInfoDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/PluginManager/PluginInstallDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/PluginManager/PluginInstallDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/PluginManager/PluginManager.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/PluginManager/PluginManager.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/PluginManager/PluginRepositoryDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/PluginManager/PluginRepositoryDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -121,11 +121,14 @@ self.__integratedWidget = integrated self.__statusTranslations = { + "obsolete": self.tr("Obsolete"), "stable": self.tr("Stable"), + "unknown": self.tr("Unknown"), "unstable": self.tr("Unstable"), - "obsolete": self.tr("Obsolete"), - "unknown": self.tr("Unknown"), + "upgrade": self.tr("Upgrade Available"), } + self.__statusOrder = ("upgrade", "stable", "unstable", "obsolete", "unknown") + self.__initHeaderItemsCache() if self.__integratedWidget: @@ -199,9 +202,6 @@ self.repositoryList.headerItem().setText( self.repositoryList.columnCount(), "" ) - self.repositoryList.header().setSortIndicator( - 0, Qt.SortOrder.AscendingOrder - ) self.__downloadButton.setEnabled(False) self.__downloadInstallButton.setEnabled(False) @@ -550,21 +550,6 @@ # repopulate the list to update the refresh icons self.__populateList() - def __resortRepositoryList(self): - """ - Private method to resort the tree. - """ - if self.__integratedWidget: - self.repositoryList.sortItems( - self.repositoryList.sortColumn(), - Qt.SortOrder.AscendingOrder, - ) - else: - self.repositoryList.sortItems( - self.repositoryList.sortColumn(), - self.repositoryList.header().sortIndicatorOrder(), - ) - def __initHeaderItemsCache(self): """ Private method to initialize the cache variables for the header items. @@ -591,10 +576,13 @@ if f.open(QIODevice.OpenModeFlag.ReadOnly): reader = PluginRepositoryReader(f, self.addEntry) reader.readXML() + self.__updateStatusItemTexts() + self.repositoryList.resizeColumnToContents(0) self.repositoryList.resizeColumnToContents(1) self.repositoryList.resizeColumnToContents(2) - self.__resortRepositoryList() + self.repositoryList.sortItems(0, Qt.SortOrder.AscendingOrder) + url = Preferences.getUI("PluginRepositoryUrl7") if url != self.repositoryUrlEdit.text(): self.repositoryUrlEdit.setText(url) @@ -764,6 +752,81 @@ self.downloadProgress.setMaximum(total) self.downloadProgress.setValue(done) + def __addPluginItem( + self, + parentItem, + name, + short, + description, + url, + author, + version, + filename, + updateStatus, + countIt=True, + ): + """ + Private method to add an item for the given plugin parameters. + + @param parentItem reference to the parent item + @type QTreeWidgetItem + @param name data for the name field + @type str + @param short data for the short field + @type str + @param description data for the description field + @type list of str + @param url data for the url field + @type str + @param author data for the author field + @type str + @param version data for the version field + @type str + @param filename data for the filename field + @type str + @param updateStatus update status + @type PluginStatus + @param countIt flag indicating to count the item for status labels + (defaults to True) + @type bool (optional) + """ + if self.__integratedWidget: + entryFormat = "<b>{0}</b> - Version: <i>{1}</i><br/>{2}" + itm = QTreeWidgetItem(parentItem) + itm.setFirstColumnSpanned(True) + label = QLabel(entryFormat.format(name, version, short)) + self.repositoryList.setItemWidget(itm, 0, label) + else: + itm = QTreeWidgetItem(parentItem, [name, version, short]) + + itm.setData(0, PluginRepositoryWidget.UrlRole, url) + itm.setData(0, PluginRepositoryWidget.FilenameRole, filename) + itm.setData(0, PluginRepositoryWidget.AuthorRole, author) + itm.setData(0, PluginRepositoryWidget.DescrRole, description) + + iconColumn = 0 if self.__integratedWidget else 1 + if updateStatus == PluginStatus.UpToDate: + itm.setIcon(iconColumn, EricPixmapCache.getIcon("empty")) + itm.setToolTip(iconColumn, self.tr("up-to-date")) + elif updateStatus == PluginStatus.New: + itm.setIcon(iconColumn, EricPixmapCache.getIcon("download")) + itm.setToolTip(iconColumn, self.tr("new download available")) + if countIt: + self.__newItems += 1 + elif updateStatus == PluginStatus.LocalUpdate: + itm.setIcon(iconColumn, EricPixmapCache.getIcon("updateLocal")) + itm.setToolTip(iconColumn, self.tr("update installable")) + if countIt: + self.__updateLocalItems += 1 + elif updateStatus == PluginStatus.RemoteUpdate: + itm.setIcon(iconColumn, EricPixmapCache.getIcon("updateRemote")) + itm.setToolTip(iconColumn, self.tr("updated download available")) + if countIt: + self.__updateRemoteItems += 1 + elif updateStatus == PluginStatus.Error: + itm.setIcon(iconColumn, EricPixmapCache.getIcon("warning")) + itm.setToolTip(iconColumn, self.tr("error determining status")) + def addEntry( self, name, @@ -805,14 +868,9 @@ # 1. determine and create the status item statusItem = self.__statusItems[status] if statusItem is None: - statusItem = QTreeWidgetItem( - self.repositoryList, - [ - self.__statusTranslations.get( - status, self.__statusTranslations["unknown"] - ) - ], - ) + if status not in self.__statusTranslations: + status = "unknown" + statusItem = QTreeWidgetItem(self.repositoryList, [""]) statusItem.setExpanded(True) statusItem.setFirstColumnSpanned(True) self.__statusItems[status] = statusItem @@ -828,40 +886,42 @@ self.__categoryItems[status][category] = categoryItem # 3. create the plugin item - if self.__integratedWidget: - entryFormat = "<b>{0}</b> - Version: <i>{1}</i><br/>{2}" - itm = QTreeWidgetItem(categoryItem) - itm.setFirstColumnSpanned(True) - label = QLabel(entryFormat.format(name, version, short)) - self.repositoryList.setItemWidget(itm, 0, label) - else: - itm = QTreeWidgetItem(categoryItem, [name, version, short]) + updateStatus = self.__updateStatus(filename, version) + self.__addPluginItem( + categoryItem, + name, + short, + description, + url, + author, + version, + filename, + updateStatus, + ) - itm.setData(0, PluginRepositoryWidget.UrlRole, url) - itm.setData(0, PluginRepositoryWidget.FilenameRole, filename) - itm.setData(0, PluginRepositoryWidget.AuthorRole, author) - itm.setData(0, PluginRepositoryWidget.DescrRole, description) + # 4. create the upgradable plugin item + if updateStatus in (PluginStatus.LocalUpdate, PluginStatus.RemoteUpdate): + status = "upgrade" - iconColumn = 0 if self.__integratedWidget else 1 - updateStatus = self.__updateStatus(filename, version) - if updateStatus == PluginStatus.UpToDate: - itm.setIcon(iconColumn, EricPixmapCache.getIcon("empty")) - itm.setToolTip(iconColumn, self.tr("up-to-date")) - elif updateStatus == PluginStatus.New: - itm.setIcon(iconColumn, EricPixmapCache.getIcon("download")) - itm.setToolTip(iconColumn, self.tr("new download available")) - self.__newItems += 1 - elif updateStatus == PluginStatus.LocalUpdate: - itm.setIcon(iconColumn, EricPixmapCache.getIcon("updateLocal")) - itm.setToolTip(iconColumn, self.tr("update installable")) - self.__updateLocalItems += 1 - elif updateStatus == PluginStatus.RemoteUpdate: - itm.setIcon(iconColumn, EricPixmapCache.getIcon("updateRemote")) - itm.setToolTip(iconColumn, self.tr("updated download available")) - self.__updateRemoteItems += 1 - elif updateStatus == PluginStatus.Error: - itm.setIcon(iconColumn, EricPixmapCache.getIcon("warning")) - itm.setToolTip(iconColumn, self.tr("error determining status")) + statusItem = self.__statusItems[status] + if statusItem is None: + statusItem = QTreeWidgetItem(self.repositoryList, [""]) + statusItem.setExpanded(True) + statusItem.setFirstColumnSpanned(True) + self.__statusItems[status] = statusItem + + self.__addPluginItem( + statusItem, + name, + short, + description, + url, + author, + version, + filename, + updateStatus, + countIt=False, + ) def __updateStatus(self, filename, version): """ @@ -928,6 +988,23 @@ else: return PluginStatus.RemoteUpdate + def __updateStatusItemTexts(self): + """ + Private method to update the status item texts to include a number determined + by a given status order. + """ + index = 1 + for status in self.__statusOrder: + statusItem = self.__statusItems[status] + if statusItem is not None: + statusItem.setText( + 0, + self.tr("{0}. {1}").format( + index, self.__statusTranslations[status] + ), + ) + index += 1 + def __sslErrors(self, reply, errors): """ Private slot to handle SSL errors.
--- a/src/eric7/PluginManager/PluginRepositoryDialog.ui Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/PluginManager/PluginRepositoryDialog.ui Tue Jan 14 17:29:56 2025 +0100 @@ -28,20 +28,23 @@ </sizepolicy> </property> <property name="contextMenuPolicy"> - <enum>Qt::CustomContextMenu</enum> + <enum>Qt::ContextMenuPolicy::CustomContextMenu</enum> </property> <property name="alternatingRowColors"> <bool>true</bool> </property> <property name="selectionMode"> - <enum>QAbstractItemView::ExtendedSelection</enum> + <enum>QAbstractItemView::SelectionMode::ExtendedSelection</enum> </property> <property name="sortingEnabled"> - <bool>true</bool> + <bool>false</bool> </property> <property name="allColumnsShowFocus"> <bool>true</bool> </property> + <attribute name="headerShowSortIndicator" stdset="0"> + <bool>false</bool> + </attribute> <column> <property name="text"> <string>Name</string> @@ -79,7 +82,7 @@ <item> <spacer name="horizontalSpacer_3"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <property name="sizeHint" stdset="0"> <size> @@ -102,7 +105,7 @@ <item> <spacer name="horizontalSpacer_2"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <property name="sizeHint" stdset="0"> <size> @@ -125,7 +128,7 @@ <item> <spacer name="horizontalSpacer"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <property name="sizeHint" stdset="0"> <size> @@ -153,7 +156,7 @@ <string>Description:</string> </property> <property name="alignment"> - <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> + <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set> </property> </widget> </item> @@ -166,7 +169,7 @@ </sizepolicy> </property> <property name="focusPolicy"> - <enum>Qt::NoFocus</enum> + <enum>Qt::FocusPolicy::NoFocus</enum> </property> <property name="toolTip"> <string>Displays the description of the selected plugin</string> @@ -186,7 +189,7 @@ <item row="3" column="1"> <widget class="QLineEdit" name="authorEdit"> <property name="focusPolicy"> - <enum>Qt::NoFocus</enum> + <enum>Qt::FocusPolicy::NoFocus</enum> </property> <property name="toolTip"> <string>Displays the author of the selected plugin</string> @@ -206,7 +209,7 @@ <item row="4" column="1"> <widget class="QLineEdit" name="urlEdit"> <property name="focusPolicy"> - <enum>Qt::NoFocus</enum> + <enum>Qt::FocusPolicy::NoFocus</enum> </property> <property name="toolTip"> <string>Displays the download URL of the selected plugin</string> @@ -221,7 +224,7 @@ <item> <widget class="Line" name="line"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> </widget> </item> @@ -282,10 +285,10 @@ <item> <widget class="QDialogButtonBox" name="buttonBox"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <property name="standardButtons"> - <set>QDialogButtonBox::NoButton</set> + <set>QDialogButtonBox::StandardButton::NoButton</set> </property> </widget> </item>
--- a/src/eric7/PluginManager/PluginRepositoryReader.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/PluginManager/PluginRepositoryReader.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/PluginManager/PluginUninstallDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/PluginManager/PluginUninstallDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/PluginManager/PluginUtilities.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/PluginManager/PluginUtilities.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/PluginManager/Ui_PluginRepositoryDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/PluginManager/Ui_PluginRepositoryDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # Form implementation generated from reading ui file 'src/eric7/PluginManager/PluginRepositoryDialog.ui' # -# Created by: PyQt6 UI code generator 6.7.0 +# Created by: PyQt6 UI code generator 6.8.0 # # WARNING: Any manual changes made to this file will be lost when pyuic6 is # run again. Do not edit this file unless you know what you are doing. @@ -29,6 +29,7 @@ self.repositoryList.setSelectionMode(QtWidgets.QAbstractItemView.SelectionMode.ExtendedSelection) self.repositoryList.setAllColumnsShowFocus(True) self.repositoryList.setObjectName("repositoryList") + self.repositoryList.header().setSortIndicatorShown(False) self.gridLayout.addWidget(self.repositoryList, 0, 0, 1, 2) self.horizontalLayout_2 = QtWidgets.QHBoxLayout() self.horizontalLayout_2.setObjectName("horizontalLayout_2") @@ -129,7 +130,7 @@ def retranslateUi(self, PluginRepositoryDialog): _translate = QtCore.QCoreApplication.translate PluginRepositoryDialog.setWindowTitle(_translate("PluginRepositoryDialog", "Plugin Repository")) - self.repositoryList.setSortingEnabled(True) + self.repositoryList.setSortingEnabled(False) self.repositoryList.headerItem().setText(0, _translate("PluginRepositoryDialog", "Name")) self.repositoryList.headerItem().setText(1, _translate("PluginRepositoryDialog", "Version")) self.repositoryList.headerItem().setText(2, _translate("PluginRepositoryDialog", "Short Description"))
--- a/src/eric7/PluginManager/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/PluginManager/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/AboutPlugin/AboutDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/AboutPlugin/AboutDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2004 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2004 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/AboutPlugin/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/AboutPlugin/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Annotations/AnnotationsChecker.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Annotations/AnnotationsChecker.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Annotations/AnnotationsCheckerDefaults.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Annotations/AnnotationsCheckerDefaults.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Annotations/AnnotationsDeprecationsVisitor.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Annotations/AnnotationsDeprecationsVisitor.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Annotations/AnnotationsEnums.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Annotations/AnnotationsEnums.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Annotations/AnnotationsFunctionVisitor.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Annotations/AnnotationsFunctionVisitor.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Annotations/AnnotationsFutureVisitor.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Annotations/AnnotationsFutureVisitor.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Annotations/AnnotationsUnionVisitor.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Annotations/AnnotationsUnionVisitor.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Annotations/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Annotations/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Annotations/translations.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Annotations/translations.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> #
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/AstUtilities.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/AstUtilities.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Async/AsyncChecker.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Async/AsyncChecker.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Async/AsyncVisitor.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Async/AsyncVisitor.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Async/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Async/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Async/translations.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Async/translations.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleAddBuiltinIgnoreDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleAddBuiltinIgnoreDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleChecker.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleChecker.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerUtilities.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerUtilities.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCodeSelectionDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCodeSelectionDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleFixer.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleFixer.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleStatisticsDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleStatisticsDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Complexity/ComplexityChecker.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Complexity/ComplexityChecker.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Complexity/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Complexity/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Complexity/mccabe.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Complexity/mccabe.py Tue Jan 14 17:29:56 2025 +0100 @@ -11,7 +11,7 @@ # - use 'import ...' instead of 'from ... import ...' # - removed 'McCabeChecker' because we have our own checker class # -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # import collections
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Complexity/translations.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Complexity/translations.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> #
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/DocStyle/DocStyleChecker.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/DocStyle/DocStyleChecker.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2013 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2013 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/DocStyle/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/DocStyle/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/DocStyle/translations.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/DocStyle/translations.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> #
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Imports/ImportsChecker.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Imports/ImportsChecker.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Imports/LocalImportVisitor.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Imports/LocalImportVisitor.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Imports/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Imports/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Imports/translations.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Imports/translations.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Logging/LoggingChecker.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Logging/LoggingChecker.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Logging/LoggingVisitor.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Logging/LoggingVisitor.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Logging/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Logging/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Logging/translations.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Logging/translations.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> #
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Miscellaneous/MiscellaneousChecker.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Miscellaneous/MiscellaneousChecker.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Miscellaneous/MiscellaneousDefaults.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Miscellaneous/MiscellaneousDefaults.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Miscellaneous/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Miscellaneous/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Miscellaneous/translations.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Miscellaneous/translations.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> #
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/NameOrder/ImportNode.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/NameOrder/ImportNode.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/NameOrder/ImportsEnums.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/NameOrder/ImportsEnums.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/NameOrder/NameOrderChecker.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/NameOrder/NameOrderChecker.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/NameOrder/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/NameOrder/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/NameOrder/translations.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/NameOrder/translations.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Naming/NamingStyleChecker.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Naming/NamingStyleChecker.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2013 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2013 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Naming/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Naming/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Naming/translations.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Naming/translations.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> #
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/PathLib/PathlibChecker.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/PathLib/PathlibChecker.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/PathLib/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/PathLib/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/PathLib/translations.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/PathLib/translations.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> #
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/assert.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/assert.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/awsHardcodedPassword.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/awsHardcodedPassword.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/certificateValidation.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/certificateValidation.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/djangoSqlInjection.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/djangoSqlInjection.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/djangoXssVulnerability.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/djangoXssVulnerability.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/exec.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/exec.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/flaskDebug.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/flaskDebug.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/generalBindAllInterfaces.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/generalBindAllInterfaces.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/generalFilePermissions.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/generalFilePermissions.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/generalHardcodedPassword.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/generalHardcodedPassword.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/generalHardcodedTmp.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/generalHardcodedTmp.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/injectionParamiko.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/injectionParamiko.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/injectionShell.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/injectionShell.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/injectionSql.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/injectionSql.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/injectionWildcard.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/injectionWildcard.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/insecureHashlibNew.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/insecureHashlibNew.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/insecureSslTls.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/insecureSslTls.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/jinja2Templates.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/jinja2Templates.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/loggingConfigInsecureListen.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/loggingConfigInsecureListen.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/makoTemplates.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/makoTemplates.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/prohibitedCalls.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/prohibitedCalls.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/prohibitedImports.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/prohibitedImports.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/pytorchLoadSave.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/pytorchLoadSave.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2024 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/requestWithoutTimeout.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/requestWithoutTimeout.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/snmpSecurity.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/snmpSecurity.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/sshNoHostKeyVerification.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/sshNoHostKeyVerification.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/tarfileUnsafeMembers.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/tarfileUnsafeMembers.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/trojanSource.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/trojanSource.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2024 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/tryExcept.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/tryExcept.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/weakCryptographicKey.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/weakCryptographicKey.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/yamlLoad.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/yamlLoad.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/SecurityChecker.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/SecurityChecker.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/SecurityContext.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/SecurityContext.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/SecurityDefaults.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/SecurityDefaults.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/SecurityNodeVisitor.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/SecurityNodeVisitor.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/SecurityUtils.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/SecurityUtils.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/translations.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/translations.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> #
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Simplify/SimplifyChecker.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Simplify/SimplifyChecker.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Simplify/SimplifyNodeVisitor.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Simplify/SimplifyNodeVisitor.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Simplify/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Simplify/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Simplify/translations.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Simplify/translations.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> #
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Unused/UnusedChecker.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Unused/UnusedChecker.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Unused/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Unused/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Unused/translations.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Unused/translations.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/pycodestyle.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/pycodestyle.py Tue Jan 14 17:29:56 2025 +0100 @@ -58,7 +58,7 @@ # - made messages translatable via Qt # - added code for eric integration # -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # import bisect
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/translations.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/translations.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckService.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckService.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2013 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2013 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # # pylint: disable=C0103
--- a/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/jsCheckSyntax.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/jsCheckSyntax.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Copyright (c) 2014 - 2021 Detlev Offenbach <detlev@die-offenbachs.de> -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/jsonCheckSyntax.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/jsonCheckSyntax.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/pyCheckSyntax.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/pyCheckSyntax.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/pyflakes/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/pyflakes/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/pyflakes/checker.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/pyflakes/checker.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # # Original (c) 2005-2010 Divmod, Inc. #
--- a/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/pyflakes/messages.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/pyflakes/messages.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # # Original (c) 2005 Divmod, Inc. See __init__.py file for details #
--- a/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/tomlCheckSyntax.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/tomlCheckSyntax.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/yamlCheckSyntax.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/yamlCheckSyntax.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/CheckerPlugins/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2004 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2004 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/DocumentationPlugins/Ericapi/EricapiExecDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/DocumentationPlugins/Ericapi/EricapiExecDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/DocumentationPlugins/Ericapi/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/DocumentationPlugins/Ericapi/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/DocumentationPlugins/Ericdoc/EricdocExecDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/DocumentationPlugins/Ericdoc/EricdocExecDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/DocumentationPlugins/Ericdoc/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/DocumentationPlugins/Ericdoc/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/DocumentationPlugins/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/DocumentationPlugins/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/PluginAbout.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/PluginAbout.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/PluginCodeStyleChecker.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/PluginCodeStyleChecker.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/PluginEricapi.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/PluginEricapi.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/PluginEricdoc.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/PluginEricdoc.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/PluginSyntaxChecker.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/PluginSyntaxChecker.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/PluginTranslator.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/PluginTranslator.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/PluginVcsGit.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/PluginVcsGit.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/PluginVcsMercurial.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/PluginVcsMercurial.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/PluginVcsPySvn.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/PluginVcsPySvn.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/PluginVcsSubversion.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/PluginVcsSubversion.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/PluginVmListspace.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/PluginVmListspace.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/PluginVmTabview.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/PluginVmTabview.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/PluginWizardDotDesktop.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/PluginWizardDotDesktop.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2013 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2013 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/PluginWizardEricMessageBox.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/PluginWizardEricMessageBox.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/PluginWizardEricPlugin.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/PluginWizardEricPlugin.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/PluginWizardPyRegExp.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/PluginWizardPyRegExp.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/PluginWizardQColorDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/PluginWizardQColorDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/PluginWizardQFileDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/PluginWizardQFileDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/PluginWizardQFontDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/PluginWizardQFontDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/PluginWizardQInputDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/PluginWizardQInputDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/PluginWizardQMessageBox.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/PluginWizardQMessageBox.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/PluginWizardQRegularExpression.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/PluginWizardQRegularExpression.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2013 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2013 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/PluginWizardSetup.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/PluginWizardSetup.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2013 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2013 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/UiExtensionPlugins/Translator/ConfigurationPage/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/UiExtensionPlugins/Translator/ConfigurationPage/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/UiExtensionPlugins/Translator/Translator.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/UiExtensionPlugins/Translator/Translator.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/DeepLEngine.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/DeepLEngine.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/GoogleV1Engine.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/GoogleV1Engine.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/GoogleV2Engine.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/GoogleV2Engine.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/IbmWatsonEngine.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/IbmWatsonEngine.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2018 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2018 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/LibreTranslateEngine.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/LibreTranslateEngine.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/MicrosoftEngine.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/MicrosoftEngine.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/MyMemoryEngine.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/MyMemoryEngine.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/TranslationEngine.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/TranslationEngine.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/YandexEngine.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/YandexEngine.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorLanguagesDb.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorRequest.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorRequest.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/UiExtensionPlugins/Translator/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/UiExtensionPlugins/Translator/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/UiExtensionPlugins/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/UiExtensionPlugins/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/Config.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/Config.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> #
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/ConfigurationPage/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/ConfigurationPage/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> #
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitApplyBundleDataDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitBisectStartDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitBlameDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitBlameDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitBranchDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitBranchDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitBranchPushDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitBundleDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitBundleDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2018 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2018 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitCommandDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitCommandDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitCommitDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitCommitDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitCopyDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitCopyDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitDescribeDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitDescribeDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -52,6 +52,9 @@ self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setEnabled(False) self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setDefault(True) + self.errorGroup.hide() + self.inputGroup.hide() + self.process = None self.username = "" self.password = ""
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitDiffDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitDiffDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitDiffGenerator.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitDiffGenerator.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitDiffHighlighter.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitDiffHighlighter.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitDiffParser.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitDiffParser.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitFetchDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitFetchDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitListDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitListDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitMergeDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitMergeDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitOptionsDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitOptionsDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitPullDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitPullDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitPushDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitPushDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitRevisionSelectionDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitRevisionsSelectionDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitStashDataDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitStashDataDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitStatusDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitStatusDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitStatusMonitorThread.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitStatusMonitorThread.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitSubmodulesDeinitDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitSubmodulesSummaryOptionsDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitSubmodulesSyncDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitTagDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitTagDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitUserConfigDataDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitUtilities.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitUtilities.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitWorktreeAddDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitWorktreeAddDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitWorktreeDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitWorktreeDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitWorktreePathsDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitWorktreePathsDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/ProjectHelper.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/ProjectHelper.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/git.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/git.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/HgCloseHeadSelectionDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/HgCloseHeadSelectionDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/ProjectHelper.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/ProjectHelper.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/closehead.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/closehead.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -15,7 +15,7 @@ class Closehead(HgExtension): """ - Class implementing the strip extension interface. + Class implementing the closehead extension interface. """ def __init__(self, vcs, ui=None): @@ -33,8 +33,8 @@ """ Public method to close arbitrary heads. - @param revisions revisions of branch heads to be closed - @type str + @param revisions list of revisions of branch heads to be closed + @type list of str """ from .HgCloseHeadSelectionDialog import HgCloseHeadSelectionDialog
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/Config.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/Config.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,82 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2025 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing the fastexport configuration dialog. +""" + +from PyQt6.QtCore import pyqtSlot +from PyQt6.QtWidgets import QDialog, QDialogButtonBox + +from eric7.EricWidgets.EricPathPicker import EricPathPickerModes + +from .Ui_HgFastexportConfigDialog import Ui_HgFastexportConfigDialog + + +class HgFastexportConfigDialog(QDialog, Ui_HgFastexportConfigDialog): + """ + Class implementing the fastexport configuration dialog. + """ + + def __init__(self, revisions=None, parent=None): + """ + Constructor + + @param revisions list of revisions, tags or branches to be exported + (defaults to None) + @type list of str (optional) + @param parent reference to the parent widget (defaults to None) + @type QWidget (optional) + """ + super().__init__(parent) + self.setupUi(self) + + self.outputPicker.setMode(EricPathPickerModes.SAVE_FILE_ENSURE_EXTENSION_MODE) + self.authormapPicker.setMode(EricPathPickerModes.OPEN_FILE_MODE) + self.importMarksPicker.setMode(EricPathPickerModes.OPEN_FILE_MODE) + self.exportMarksPicker.setMode( + EricPathPickerModes.SAVE_FILE_ENSURE_EXTENSION_MODE + ) + fileFilters = self.tr("Text Files (*.txt);;All Files (*)") + for picker in ( + self.outputPicker, + self.authormapPicker, + self.importMarksPicker, + self.exportMarksPicker, + ): + picker.setFilters(fileFilters) + + self.outputPicker.textChanged.connect(self.__updateOK) + + if revisions: + self.revisionsEdit.setText(", ".join(revisions)) + + self.__updateOK() + + @pyqtSlot() + def __updateOK(self): + """ + Private slot to updated the enabled state of the OK button. + """ + self.buttonBox.button(QDialogButtonBox.StandardButton.Ok).setEnabled( + bool(self.outputPicker.text()) + ) + + def getData(self): + """ + Public method to get the entered fastexport configuration data. + + @return tuple containing the fastexport configuration (output file, + list of revisions, author map file, import marks file, export marks + file) + @rtype tuple of (str, list of str, str, str, str) + """ + return ( + self.outputPicker.text(), + [r.strip() for r in self.revisionsEdit.text().split(",") if r.strip()], + self.authormapPicker.text(), + self.importMarksPicker.text(), + self.exportMarksPicker.text(), + )
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,164 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>HgFastexportConfigDialog</class> + <widget class="QDialog" name="HgFastexportConfigDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>600</width> + <height>172</height> + </rect> + </property> + <property name="windowTitle"> + <string>fastexport Configuration</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="4" column="1"> + <widget class="EricPathPicker" name="exportMarksPicker" native="true"> + <property name="focusPolicy"> + <enum>Qt::FocusPolicy::StrongFocus</enum> + </property> + <property name="toolTip"> + <string>Enter the path of the file for the exported marks.</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="EricPathPicker" name="outputPicker" native="true"> + <property name="focusPolicy"> + <enum>Qt::FocusPolicy::StrongFocus</enum> + </property> + <property name="toolTip"> + <string>Enter the path of the output file.</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Revisions:</string> + </property> + </widget> + </item> + <item row="3" column="1"> + <widget class="EricPathPicker" name="importMarksPicker" native="true"> + <property name="focusPolicy"> + <enum>Qt::FocusPolicy::StrongFocus</enum> + </property> + <property name="toolTip"> + <string>Enter the path of the file containing already exported marks.</string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>Author Map:</string> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QLabel" name="label_4"> + <property name="text"> + <string>Import Marks:</string> + </property> + </widget> + </item> + <item row="4" column="0"> + <widget class="QLabel" name="label_5"> + <property name="text"> + <string>Export Marks:</string> + </property> + </widget> + </item> + <item row="0" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>Output File:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QLineEdit" name="revisionsEdit"> + <property name="toolTip"> + <string>Enter the revisions, tags or branches to be exported (separated by comma).</string> + </property> + <property name="clearButtonEnabled"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="5" column="0" colspan="2"> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="standardButtons"> + <set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok</set> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="EricPathPicker" name="authormapPicker" native="true"> + <property name="focusPolicy"> + <enum>Qt::FocusPolicy::StrongFocus</enum> + </property> + <property name="toolTip"> + <string>Enter the path of the author map file.</string> + </property> + </widget> + </item> + </layout> + </widget> + <customwidgets> + <customwidget> + <class>EricPathPicker</class> + <extends>QWidget</extends> + <header>eric7/EricWidgets/EricPathPicker.h</header> + <container>1</container> + </customwidget> + </customwidgets> + <tabstops> + <tabstop>outputPicker</tabstop> + <tabstop>revisionsEdit</tabstop> + <tabstop>authormapPicker</tabstop> + <tabstop>importMarksPicker</tabstop> + <tabstop>exportMarksPicker</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>HgFastexportConfigDialog</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>177</x> + <y>151</y> + </hint> + <hint type="destinationlabel"> + <x>179</x> + <y>168</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>HgFastexportConfigDialog</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>289</x> + <y>151</y> + </hint> + <hint type="destinationlabel"> + <x>289</x> + <y>170</y> + </hint> + </hints> + </connection> + </connections> +</ui>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,86 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2025 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing the fastexport extension project helper. +""" + +from PyQt6.QtCore import pyqtSlot +from PyQt6.QtWidgets import QMenu + +from eric7.EricGui import EricPixmapCache +from eric7.EricGui.EricAction import EricAction + +from ..HgExtensionProjectHelper import HgExtensionProjectHelper + + +class FastexportProjectHelper(HgExtensionProjectHelper): + """ + Class implementing the fastexport extension project helper. + """ + + def __init__(self): + """ + Constructor + """ + super().__init__() + + def initActions(self): + """ + Public method to generate the action objects. + """ + self.hgFastexportAct = EricAction( + self.tr("Export to git"), + EricPixmapCache.getIcon("vcsFastexport"), + self.tr("Export to git"), + 0, + 0, + self, + "mercurial_fastexport", + ) + self.hgFastexportAct.setStatusTip( + self.tr("Export the repository as git fast-import stream.") + ) + self.hgFastexportAct.setWhatsThis( + self.tr( + """<b>Export to git</b>""" + """<p>This exports the repository as a git fast-import stream.</p>""" + ) + ) + self.hgFastexportAct.triggered.connect(self.__hgFastexport) + self.actions.append(self.hgFastexportAct) + + def initMenu(self, mainMenu): + """ + Public method to generate the extension menu. + + @param mainMenu reference to the main menu + @type QMenu + @return populated menu + @rtype QMenu + """ + menu = QMenu(self.menuTitle(), mainMenu) + menu.setIcon(EricPixmapCache.getIcon("vcsFastexport")) + menu.setTearOffEnabled(True) + + menu.addAction(self.hgFastexportAct) + + return menu + + def menuTitle(self): + """ + Public method to get the menu title. + + @return title of the menu + @rtype str + """ + return self.tr("Fastexport") + + @pyqtSlot() + def __hgFastexport(self): + """ + Private slot used to generate a git fast-import file. + """ + self.vcs.getExtensionObject("fastexport").hgFastexport()
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/FastexportExtension/Ui_HgFastexportConfigDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,81 @@ +# Form implementation generated from reading ui file 'src/eric7/Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui' +# +# Created by: PyQt6 UI code generator 6.7.1 +# +# WARNING: Any manual changes made to this file will be lost when pyuic6 is +# run again. Do not edit this file unless you know what you are doing. + + +from PyQt6 import QtCore, QtGui, QtWidgets + + +class Ui_HgFastexportConfigDialog(object): + def setupUi(self, HgFastexportConfigDialog): + HgFastexportConfigDialog.setObjectName("HgFastexportConfigDialog") + HgFastexportConfigDialog.resize(600, 172) + HgFastexportConfigDialog.setSizeGripEnabled(True) + self.gridLayout = QtWidgets.QGridLayout(HgFastexportConfigDialog) + self.gridLayout.setObjectName("gridLayout") + self.exportMarksPicker = EricPathPicker(parent=HgFastexportConfigDialog) + self.exportMarksPicker.setFocusPolicy(QtCore.Qt.FocusPolicy.StrongFocus) + self.exportMarksPicker.setObjectName("exportMarksPicker") + self.gridLayout.addWidget(self.exportMarksPicker, 4, 1, 1, 1) + self.outputPicker = EricPathPicker(parent=HgFastexportConfigDialog) + self.outputPicker.setFocusPolicy(QtCore.Qt.FocusPolicy.StrongFocus) + self.outputPicker.setObjectName("outputPicker") + self.gridLayout.addWidget(self.outputPicker, 0, 1, 1, 1) + self.label = QtWidgets.QLabel(parent=HgFastexportConfigDialog) + self.label.setObjectName("label") + self.gridLayout.addWidget(self.label, 1, 0, 1, 1) + self.importMarksPicker = EricPathPicker(parent=HgFastexportConfigDialog) + self.importMarksPicker.setFocusPolicy(QtCore.Qt.FocusPolicy.StrongFocus) + self.importMarksPicker.setObjectName("importMarksPicker") + self.gridLayout.addWidget(self.importMarksPicker, 3, 1, 1, 1) + self.label_3 = QtWidgets.QLabel(parent=HgFastexportConfigDialog) + self.label_3.setObjectName("label_3") + self.gridLayout.addWidget(self.label_3, 2, 0, 1, 1) + self.label_4 = QtWidgets.QLabel(parent=HgFastexportConfigDialog) + self.label_4.setObjectName("label_4") + self.gridLayout.addWidget(self.label_4, 3, 0, 1, 1) + self.label_5 = QtWidgets.QLabel(parent=HgFastexportConfigDialog) + self.label_5.setObjectName("label_5") + self.gridLayout.addWidget(self.label_5, 4, 0, 1, 1) + self.label_2 = QtWidgets.QLabel(parent=HgFastexportConfigDialog) + self.label_2.setObjectName("label_2") + self.gridLayout.addWidget(self.label_2, 0, 0, 1, 1) + self.revisionsEdit = QtWidgets.QLineEdit(parent=HgFastexportConfigDialog) + self.revisionsEdit.setClearButtonEnabled(True) + self.revisionsEdit.setObjectName("revisionsEdit") + self.gridLayout.addWidget(self.revisionsEdit, 1, 1, 1, 1) + self.buttonBox = QtWidgets.QDialogButtonBox(parent=HgFastexportConfigDialog) + self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok) + self.buttonBox.setObjectName("buttonBox") + self.gridLayout.addWidget(self.buttonBox, 5, 0, 1, 2) + self.authormapPicker = EricPathPicker(parent=HgFastexportConfigDialog) + self.authormapPicker.setFocusPolicy(QtCore.Qt.FocusPolicy.StrongFocus) + self.authormapPicker.setObjectName("authormapPicker") + self.gridLayout.addWidget(self.authormapPicker, 2, 1, 1, 1) + + self.retranslateUi(HgFastexportConfigDialog) + self.buttonBox.accepted.connect(HgFastexportConfigDialog.accept) # type: ignore + self.buttonBox.rejected.connect(HgFastexportConfigDialog.reject) # type: ignore + QtCore.QMetaObject.connectSlotsByName(HgFastexportConfigDialog) + HgFastexportConfigDialog.setTabOrder(self.outputPicker, self.revisionsEdit) + HgFastexportConfigDialog.setTabOrder(self.revisionsEdit, self.authormapPicker) + HgFastexportConfigDialog.setTabOrder(self.authormapPicker, self.importMarksPicker) + HgFastexportConfigDialog.setTabOrder(self.importMarksPicker, self.exportMarksPicker) + + def retranslateUi(self, HgFastexportConfigDialog): + _translate = QtCore.QCoreApplication.translate + HgFastexportConfigDialog.setWindowTitle(_translate("HgFastexportConfigDialog", "fastexport Configuration")) + self.exportMarksPicker.setToolTip(_translate("HgFastexportConfigDialog", "Enter the path of the file for the exported marks.")) + self.outputPicker.setToolTip(_translate("HgFastexportConfigDialog", "Enter the path of the output file.")) + self.label.setText(_translate("HgFastexportConfigDialog", "Revisions:")) + self.importMarksPicker.setToolTip(_translate("HgFastexportConfigDialog", "Enter the path of the file containing already exported marks.")) + self.label_3.setText(_translate("HgFastexportConfigDialog", "Author Map:")) + self.label_4.setText(_translate("HgFastexportConfigDialog", "Import Marks:")) + self.label_5.setText(_translate("HgFastexportConfigDialog", "Export Marks:")) + self.label_2.setText(_translate("HgFastexportConfigDialog", "Output File:")) + self.revisionsEdit.setToolTip(_translate("HgFastexportConfigDialog", "Enter the revisions, tags or branches to be exported (separated by comma).")) + self.authormapPicker.setToolTip(_translate("HgFastexportConfigDialog", "Enter the path of the author map file.")) +from eric7.EricWidgets.EricPathPicker import EricPathPicker
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/FastexportExtension/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,8 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2025 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Package implementing the fastexport extension support interface. +"""
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,188 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2025 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing the fastexport extension interface. +""" + +import os + +from PyQt6.QtCore import QProcess, pyqtSlot +from PyQt6.QtWidgets import QDialog + +from eric7.EricWidgets import EricMessageBox +from eric7.EricWidgets.EricProgressDialog import EricProgressDialog + +from ..HgExtension import HgExtension +from ..HgUtilities import getHgExecutable, parseProgressInfo, prepareProcess + + +class Fastexport(HgExtension): + """ + Class implementing the fastexport extension interface. + """ + + def __init__(self, vcs, ui=None): + """ + Constructor + + @param vcs reference to the Mercurial vcs object + @type Hg + @param ui reference to a UI widget (defaults to None) + @type QWidget + """ + super().__init__(vcs, ui=ui) + + self.__process = None + self.__progress = None + + def hgFastexport(self, revisions=None): + """ + Public method to export the repository as a git fast-import stream. + + @param revisions list of revisions to be exported + @type list of str + """ + from .HgFastexportConfigDialog import HgFastexportConfigDialog + + dlg = HgFastexportConfigDialog(revisions=revisions, parent=self.ui) + if dlg.exec() == QDialog.DialogCode.Accepted: + outputFile, revisions, authormap, importMarks, exportMarks = dlg.getData() + + if os.path.exists(outputFile): + overwrite = EricMessageBox.yesNo( + self.ui, + self.tr("Mercurial Fastexport"), + self.tr( + "<p>The output file <b>{0}</b> exists already. Overwrite it?" + "</p>" + ).format(outputFile), + ) + if not overwrite: + return + + repoPath = self.vcs.getClient().getRepository() + hgExecutable = getHgExecutable() + + args = self.vcs.initCommand("fastexport") + args.extend(["--config", "progress.assume-tty=True"]) + args.extend(["--config", "progress.format=topic bar number estimate"]) + if authormap: + args.extend(["--authormap", authormap]) + if importMarks: + args.extend(["--import-marks", importMarks]) + if exportMarks: + args.extend(["--export-marks", exportMarks]) + for revision in revisions: + args.extend(["--rev", revision]) + + self.__progress = None + + self.__process = QProcess(parent=self) + prepareProcess(self.__process) + self.__process.setStandardOutputFile(outputFile) + self.__process.setWorkingDirectory(repoPath) + self.__process.readyReadStandardError.connect(self.__readStderr) + self.__process.finished.connect(self.__processFinished) + self.__process.start(hgExecutable, args) + + @pyqtSlot() + def __readStderr(self): + """ + Private slot to handle the readyReadStandardError signal. + """ + if self.__process is not None: + output = str( + self.__process.readAllStandardError(), self.vcs.getEncoding(), "replace" + ) + msg = output.splitlines()[-1].strip() + topic, value, maximum, estimate = parseProgressInfo(msg) + if topic: + # it is a valid progress line + if self.__progress is None: + self.__progress = EricProgressDialog( + labelText="", + cancelButtonText=self.tr("Cancel"), + minimum=0, + maximum=maximum, + labelFormat=self.tr("%v/%m Changesets"), + parent=self.ui, + ) + self.__progress.setWindowTitle(self.tr("Mercurial Fastexport")) + self.__progress.show() + self.__progress.setLabelText( + self.tr("Exporting repository (time remaining: {0}) ...").format( + estimate + ) + ) + self.__progress.setValue(value) + + if self.__progress.wasCanceled() and self.__process is not None: + self.__process.terminate() + + else: + if ( + self.__progress + and not self.__progress.wasCanceled() + and output.strip() + ): + EricMessageBox.warning( + self.ui, + self.tr("Mercurial Fastexport"), + self.tr( + "<p>The repository fastexport process sent an error" + " message.</p><p>{0}</p>" + ).format(output.strip()), + ) + + @pyqtSlot(int, QProcess.ExitStatus) + def __processFinished(self, exitCode, exitStatus): + """ + Private slot to handle the process finished signal. + + @param exitCode exit code of the process + @type int + @param exitStatus exit status + @type QProcess.ExitStatus + """ + if self.__progress is not None: + self.__progress.hide() + self.__progress.deleteLater() + self.__progress = None + + if exitStatus == QProcess.ExitStatus.NormalExit: + if exitCode == 0: + EricMessageBox.information( + self.ui, + self.tr("Mercurial Fastexport"), + self.tr( + "<p>The repository fastexport process finished" + " successfully.</p>" + ), + ) + elif exitCode == 255: + EricMessageBox.warning( + self.ui, + self.tr("Mercurial Fastexport"), + self.tr("<p>The repository fastexport process was cancelled.</p>"), + ) + else: + EricMessageBox.warning( + self.ui, + self.tr("Mercurial Fastexport"), + self.tr( + "<p>The repository fastexport process finished" + " with exit code <b>{0}</b>.</p>" + ).format(exitCode), + ) + else: + EricMessageBox.critical( + self.ui, + self.tr("Mercurial Fastexport"), + self.tr("<p>The repository fastexport process crashed.</p>"), + ) + + self.__process.deleteLater() + self.__process = None
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/GpgExtension/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/GpgExtension/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2013 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2013 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgBookmarkDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgBookmarkDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgBookmarkRenameDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgBookmarkRenameDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgBranchInputDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgBranchInputDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgClient.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgClient.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -60,10 +60,12 @@ # generate command line and environment self.__serverArgs = vcs.initCommand("serve") - self.__serverArgs.append("--cmdserver") - self.__serverArgs.append("pipe") - self.__serverArgs.append("--config") - self.__serverArgs.append("ui.interactive=True") + self.__serverArgs.extend(["--cmdserver", "pipe"]) + self.__serverArgs.extend(["--config", "ui.interactive=True"]) + self.__serverArgs.extend(["--config", "progress.assume-tty=True"]) + self.__serverArgs.extend( + ["--config", "progress.format=topic bar number estimate"] + ) if repoPath: self.__serverArgs.append("--repository") self.__serverArgs.append(repoPath)
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -12,6 +12,7 @@ from eric7 import Preferences, Utilities +from .HgUtilities import parseProgressInfo from .Ui_HgDialog import Ui_HgDialog @@ -42,6 +43,10 @@ self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setEnabled(False) self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setDefault(True) + self.progressWidget.hide() + self.errorGroup.hide() + self.inputGroup.hide() + self.username = "" self.password = "" self.vcs = hg @@ -56,6 +61,8 @@ Private slot called when the process finished or the user pressed the button. """ + self.progressWidget.hide() + self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setEnabled(True) self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setEnabled(False) self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setDefault(True) @@ -95,6 +102,7 @@ @return flag indicating a successful start of the process @rtype bool """ + self.progressWidget.hide() self.errorGroup.hide() self.inputGroup.hide() self.normal = False @@ -113,6 +121,8 @@ "unshelve", "strip", "histedit", + "uncommit", + "unamend", ] or ( args[0] in ["pull", "unbundle"] and ("--update" in args[1:] or "--rebase" in args[1:]) @@ -168,9 +178,11 @@ """ Private slot to show some output. - @param out output to be shown + @param out output sent to the stdout channel @type str """ + self.progressWidget.hide() + self.resultbox.insertPlainText(Utilities.filterAnsiSequences(out)) self.resultbox.ensureCursorVisible() @@ -185,14 +197,26 @@ def __showError(self, out): """ - Private slot to show some error. + Private slot to show some error or progress information. - @param out error to be shown + @param out output sent to the stderr channel @type str """ - self.errorGroup.show() - self.errors.insertPlainText(Utilities.filterAnsiSequences(out)) - self.errors.ensureCursorVisible() + for line in out.splitlines(keepends=True): + if line.strip(): + topic, value, maximum, estimate = parseProgressInfo(line.strip()) + if topic: + self.topicLabel.setText(topic.capitalize()) + self.remainingTimeLabel.setText( + self.tr("Time remaining: {0}").format(estimate) + ) + self.progressBar.setMaximum(maximum) + self.progressBar.setValue(value) + self.progressWidget.setVisible(value != maximum) + else: + self.errorGroup.show() + self.errors.insertPlainText(Utilities.filterAnsiSequences(line)) + self.errors.ensureCursorVisible() QCoreApplication.processEvents()
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgDialog.ui Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgDialog.ui Tue Jan 14 17:29:56 2025 +0100 @@ -43,6 +43,48 @@ </widget> </item> <item> + <widget class="QWidget" name="progressWidget" native="true"> + <layout class="QHBoxLayout" name="horizontalLayout"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> + <item> + <widget class="QLabel" name="topicLabel"> + <property name="text"> + <string notr="true">Topic</string> + </property> + </widget> + </item> + <item> + <widget class="QProgressBar" name="progressBar"> + <property name="value"> + <number>24</number> + </property> + <property name="format"> + <string>%v/%m</string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="remainingTimeLabel"> + <property name="text"> + <string/> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> <widget class="QGroupBox" name="errorGroup"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> @@ -76,10 +118,10 @@ <item row="1" column="1"> <spacer> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <property name="sizeType"> - <enum>QSizePolicy::Expanding</enum> + <enum>QSizePolicy::Policy::Expanding</enum> </property> <property name="sizeHint" stdset="0"> <size> @@ -128,10 +170,10 @@ <item> <widget class="QDialogButtonBox" name="buttonBox"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <property name="standardButtons"> - <set>QDialogButtonBox::Cancel|QDialogButtonBox::Close</set> + <set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Close</set> </property> </widget> </item>
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgDiffGenerator.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgDiffGenerator.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgDiffHighlighter.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgDiffHighlighter.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgExportDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgExportDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgExtension.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgExtension.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgExtensionProjectBrowserHelper.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgExtensionProjectBrowserHelper.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -75,7 +75,7 @@ return "" - def showExtensionMenu(self, key, controlled): + def showMenu(self, key, controlled): """ Public method to prepare the extension menu for display.
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgExtensionProjectHelper.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgExtensionProjectHelper.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -412,10 +412,20 @@ self.__pullAct = self.__actionsMenu.addAction( EricPixmapCache.getIcon("vcsUpdate"), - self.tr("Pull Changes"), - self.__pullActTriggered, + self.tr("Pull Selected Changes"), + lambda: self.__pullActTriggered(selectedOnly=True), + ) + self.__pullAct.setToolTip( + self.tr("Pull selected changes from a remote repository") ) - self.__pullAct.setToolTip(self.tr("Pull changes from a remote repository")) + self.__pullAllAct = self.__actionsMenu.addAction( + EricPixmapCache.getIcon("vcsUpdate"), + self.tr("Pull All Changes"), + lambda: self.__pullActTriggered(selectedOnly=False), + ) + self.__pullAllAct.setToolTip( + self.tr("Pull all changes from a remote repository") + ) self.__lfPullAct = self.__actionsMenu.addAction( self.tr("Pull Large Files"), self.__lfPullActTriggered ) @@ -1485,9 +1495,9 @@ @type str """ errLines = [ - l - for l in out.splitlines(keepends=True) - if "no such file in rev" not in l + line + for line in out.splitlines(keepends=True) + if "no such file in rev" not in line ] if errLines: self.errorGroup.show() @@ -1616,12 +1626,9 @@ self.__bookmarkAct.setEnabled(selectedItemsCount == 1) self.__bookmarkMoveAct.setEnabled(selectedItemsCount == 1) - if selectedIncomingItemsCount > 0: - self.__pullAct.setText(self.tr("Pull Selected Changes")) - else: - self.__pullAct.setText(self.tr("Pull Changes")) if self.vcs.canPull(): - self.__pullAct.setEnabled(True) + self.__pullAct.setEnabled(selectedIncomingItemsCount > 0) + self.__pullAllAct.setEnabled(True) self.__lfPullAct.setEnabled( self.vcs.isExtensionActive("largefiles") and selectedItemsCount > 0 ) @@ -1698,7 +1705,6 @@ ]: act.setEnabled(False) - self.__pullAct.setText(self.tr("Pull Selected Changes")) if self.vcs.canPull() and not bool(self.__bundle): selectedIncomingItemsCount = len( [ @@ -1708,12 +1714,14 @@ ] ) self.__pullAct.setEnabled(selectedIncomingItemsCount > 0) + self.__pullAllAct.setEnabled(True) self.__lfPullAct.setEnabled( self.vcs.isExtensionActive("largefiles") and selectedIncomingItemsCount > 0 ) else: self.__pullAct.setEnabled(False) + self.__pullAllAct.setEnabled(False) self.__lfPullAct.setEnabled(False) self.__unbundleAct.setEnabled(bool(self.__bundle)) @@ -1731,6 +1739,7 @@ self.__bookmarkAct, self.__bookmarkMoveAct, self.__pullAct, + self.__pullAllAct, self.__lfPullAct, self.__stripAct, self.__gpgSignAct, @@ -2401,9 +2410,13 @@ self.vcs.getExtensionObject("largefiles").hgLfPull(revisions=revs) @pyqtSlot() - def __pullActTriggered(self): + def __pullActTriggered(self, selectedOnly=False): """ - Private slot to pull changes from a remote repository. + Private slot to pull all or selected changes from a remote repository. + + @param selectedOnly flag indicating to pull the selected changes only + (defaults to False) + @type bool (optional) """ shouldReopen = False refresh = False @@ -2411,15 +2424,16 @@ if self.initialCommandMode in ("log", "full_log", "incoming"): revs = [] - for itm in [ - item - for item in self.logTree.selectedItems() - if item.data(0, self.__incomingRole) - ]: - rev = itm.text(self.RevisionColumn).split(":")[1].strip() - if rev: - revs.append(rev) - shouldReopen = self.vcs.hgPull(revisions=revs) + if selectedOnly: + for itm in [ + item + for item in self.logTree.selectedItems() + if item.data(0, self.__incomingRole) + ]: + rev = itm.text(self.RevisionColumn).split(":")[1].strip() + if rev: + revs.append(rev) + shouldReopen = self.vcs.hgPull(revisions=revs, noupdate=bool(revs)) refresh = True if self.initialCommandMode == "incoming": addNext = True
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgOptionsDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgOptionsDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgRemoveSubrepositoriesDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgRemoveSubrepositoriesDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2013 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2013 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgTagDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgTagDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -84,11 +84,6 @@ ) self.protocolsList.headerItem().setText(self.protocolsList.columnCount(), "") - if self.__version < (3, 9, 0): - self.disableTls10WarningCheckBox.setEnabled(False) - self.minimumProtocolComboBox.setEnabled(False) - self.minimumProtcolGroupBox.setEnabled(False) - self.tabWidget.setCurrentIndex(0) self.__editor = None @@ -115,6 +110,7 @@ self.userNameEdit.text(), self.emailEdit.text(), ) + ################################################################### ## extensions section ################################################################### @@ -128,13 +124,6 @@ del self.__config["extensions"]["gpg"] self.__config["extensions"]["#gpg"] = "" - if self.purgeCheckBox.isChecked(): - self.__config["extensions"]["purge"] = "" - else: - if "purge" in self.__config["extensions"]: - del self.__config["extensions"]["purge"] - self.__config["extensions"]["#purge"] = "" - if self.queuesCheckBox.isChecked(): self.__config["extensions"]["mq"] = "" else: @@ -149,20 +138,6 @@ del self.__config["extensions"]["rebase"] self.__config["extensions"]["#rebase"] = "" - if self.shelveCheckBox.isChecked(): - self.__config["extensions"]["shelve"] = "" - else: - if "shelve" in self.__config["extensions"]: - del self.__config["extensions"]["shelve"] - self.__config["extensions"]["#shelve"] = "" - - if self.stripCheckBox.isChecked(): - self.__config["extensions"]["strip"] = "" - else: - if "strip" in self.__config["extensions"]: - del self.__config["extensions"]["strip"] - self.__config["extensions"]["#strip"] = "" - if self.histeditCheckBox.isChecked(): self.__config["extensions"]["histedit"] = "" else: @@ -193,12 +168,27 @@ del self.__config["extensions"]["largefiles"] self.__config["extensions"]["#largefiles"] = "" - if self.closeheadCheckBox.isChecked() and self.__version >= (4, 8, 0): + if self.closeheadCheckBox.isChecked(): self.__config["extensions"]["closehead"] = "" else: if "closehead" in self.__config["extensions"]: del self.__config["extensions"]["closehead"] self.__config["extensions"]["#closehead"] = "" + + if self.fastexportCheckBox.isChecked(): + self.__config["extensions"]["fastexport"] = "" + else: + if "fastexport" in self.__config["extensions"]: + del self.__config["extensions"]["fastexport"] + self.__config["extensions"]["#fastexport"] = "" + + if self.uncommitCheckBox.isChecked(): + self.__config["extensions"]["uncommit"] = "" + else: + if "uncommit" in self.__config["extensions"]: + del self.__config["extensions"]["uncommit"] + self.__config["extensions"]["#uncommit"] = "" + ################################################################### ## http_proxy section ################################################################### @@ -213,77 +203,49 @@ else: if "http_proxy" in self.__config: del self.__config["http_proxy"] + ################################################################### ## hostfingerprints/hostsecurity section ################################################################### - if self.__version < (3, 9, 0): - # - # delete hostsecurity section - # - if "hostsecurity" in self.__config: - del self.__config["hostsecurity"] + # + # hostsecurity section + # + if "hostsecurity" not in self.__config: + self.__config["hostsecurity"] = {} - # - # hostfingerprints section - # - if self.fingerprintsList.topLevelItemCount() > 0: - self.__config["hostfingerprints"] = {} - for row in range(self.fingerprintsList.topLevelItemCount()): - itm = self.fingerprintsList.topLevelItem(row) - fingerprint = itm.text(1) - if fingerprint.startswith("sha1:"): - fingerprint = fingerprint[5:] - self.__config["hostfingerprints"][itm.text(0)] = fingerprint - else: - if "hostfingerprints" in self.__config: - del self.__config["hostfingerprints"] + if self.fingerprintsList.topLevelItemCount() > 0: + self.__clearFingerprints() + fingerprints = self.__assembleFingerprints() + for host in fingerprints: + key = "{0}:fingerprints".format(host) + self.__config["hostsecurity"][key] = ", ".join(fingerprints[host]) else: - # - # delete hostfingerprints section - # - if "hostfingerprints" in self.__config: - del self.__config["hostfingerprints"] + self.__clearFingerprints() - # - # hostsecurity section - # - if "hostsecurity" not in self.__config: - self.__config["hostsecurity"] = {} + disabletls10warning = ( + "true" if self.disableTls10WarningCheckBox.isChecked() else "false" + ) + self.__config["hostsecurity"]["disabletls10warning"] = disabletls10warning - if self.fingerprintsList.topLevelItemCount() > 0: - self.__clearFingerprints() - fingerprints = self.__assembleFingerprints() - for host in fingerprints: - key = "{0}:fingerprints".format(host) - self.__config["hostsecurity"][key] = ", ".join(fingerprints[host]) - else: - self.__clearFingerprints() - - if self.disableTls10WarningCheckBox.isChecked(): - disabletls10warning = "true" - else: - disabletls10warning = "false" - self.__config["hostsecurity"]["disabletls10warning"] = disabletls10warning + if self.minimumProtocolComboBox.currentIndex() == 0: + self.__config.remove_option("hostsecurity", "minimumprotocol") + else: + minimumProtocol = self.minimumProtocolComboBox.itemData( + self.minimumProtocolComboBox.currentIndex() + ) + self.__config["hostsecurity"]["minimumprotocol"] = minimumProtocol - if self.minimumProtocolComboBox.currentIndex() == 0: - self.__config.remove_option("hostsecurity", "minimumprotocol") - else: - minimumProtocol = self.minimumProtocolComboBox.itemData( - self.minimumProtocolComboBox.currentIndex() - ) - self.__config["hostsecurity"]["minimumprotocol"] = minimumProtocol + if self.protocolsList.topLevelItemCount() > 0: + self.__clearMinimumProtocols() + minimumProtocols = self.__assembleMinimumProtocols() + for host in minimumProtocols: + key = "{0}:minimumprotocol".format(host) + self.__config["hostsecurity"][key] = minimumProtocols[host] + else: + self.__clearMinimumProtocols() - if self.protocolsList.topLevelItemCount() > 0: - self.__clearMinimumProtocols() - minimumProtocols = self.__assembleMinimumProtocols() - for host in minimumProtocols: - key = "{0}:minimumprotocol".format(host) - self.__config["hostsecurity"][key] = minimumProtocols[host] - else: - self.__clearMinimumProtocols() - - if len(self.__config.options("hostsecurity")) == 0: - del self.__config["hostsecurity"] + if len(self.__config.options("hostsecurity")) == 0: + del self.__config["hostsecurity"] ################################################################### cfgFile = getConfigPath() @@ -312,21 +274,23 @@ # step 2: extract extensions information if "extensions" in self.__config: self.gpgCheckBox.setChecked("gpg" in self.__config["extensions"]) - self.purgeCheckBox.setChecked("purge" in self.__config["extensions"]) self.queuesCheckBox.setChecked("mq" in self.__config["extensions"]) self.rebaseCheckBox.setChecked("rebase" in self.__config["extensions"]) - self.shelveCheckBox.setChecked("shelve" in self.__config["extensions"]) self.largefilesCheckBox.setChecked( "largefiles" in self.__config["extensions"] ) - self.stripCheckBox.setChecked("strip" in self.__config["extensions"]) self.histeditCheckBox.setChecked( "histedit" in self.__config["extensions"] ) self.closeheadCheckBox.setChecked( "closehead" in self.__config["extensions"] ) - self.closeheadCheckBox.setEnabled(self.__version >= (4, 8, 0)) + self.fastexportCheckBox.setChecked( + "fastexport" in self.__config["extensions"] + ) + self.uncommitCheckBox.setChecked( + "uncommit" in self.__config["extensions"] + ) # step 3: extract large files information if "largefiles" in self.__config: @@ -356,36 +320,13 @@ if "no" in self.__config["http_proxy"]: self.proxyBypassEdit.setText(self.__config["http_proxy"]["no"]) - # step 5a: extract host fingerprints - if "hostfingerprints" in self.__config: - for host in self.__config.options("hostfingerprints"): - if self.__version < (3, 9, 0): - QTreeWidgetItem( - self.fingerprintsList, - [host, self.__config["hostfingerprints"][host]], - ) - else: - # convert to hostsecurity fingerprint - QTreeWidgetItem( - self.fingerprintsList, - [host, "sha1:" + self.__config["hostfingerprints"][host]], - ) - - # step 5b: extract hostsecurity fingerprints + # step 5: extract hostsecurity fingerprints if "hostsecurity" in self.__config: for key in self.__config.options("hostsecurity"): if key.endswith(":fingerprints"): host = key.replace(":fingerprints", "") fingerprints = self.__config["hostsecurity"][key].split(",") for fingerprint in fingerprints: - if self.__version < (3, 9, 0): - # downgrade from a newer version - if fingerprint.startswith("sha1:"): - fingerprint = fingerprint[5:] - else: - # Mercurial < 3.9.0 supports sha1 - # fingerprints only - continue QTreeWidgetItem( self.fingerprintsList, [host, fingerprint.replace("\\", "").strip()], @@ -431,25 +372,31 @@ """ Private method to clear the data of the dialog. """ + # User tab self.userNameEdit.clear() self.emailEdit.clear() + # Extensions tab self.gpgCheckBox.setChecked(False) - self.purgeCheckBox.setChecked(False) self.queuesCheckBox.setChecked(False) self.rebaseCheckBox.setChecked(False) - self.shelveCheckBox.setChecked(False) - self.stripCheckBox.setChecked(False) + self.histeditCheckBox.setChecked(False) + self.closeheadCheckBox.setChecked(False) + self.fastexportCheckBox.setChecked(False) + self.uncommitCheckBox.setChecked(False) self.largefilesCheckBox.setChecked(False) + self.lfFileSizeSpinBox.setValue(10) self.lfFilePatternsEdit.clear() self.lfUserCachePicker.clear() + # Network tab self.proxyHostEdit.clear() self.proxyUserEdit.clear() self.proxyPasswordEdit.clear() self.proxyBypassEdit.clear() + # Security tab self.fingerprintsList.clear() self.__finalizeFingerprintsColumns() self.__updateFingerprintsButtons()
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui Tue Jan 14 17:29:56 2025 +0100 @@ -91,7 +91,7 @@ <item> <spacer name="verticalSpacer"> <property name="orientation"> - <enum>Qt::Vertical</enum> + <enum>Qt::Orientation::Vertical</enum> </property> <property name="sizeHint" stdset="0"> <size> @@ -136,43 +136,13 @@ </property> </widget> </item> - <item row="0" column="1"> - <widget class="QCheckBox" name="gpgCheckBox"> + <item row="3" column="0"> + <widget class="QCheckBox" name="rebaseCheckBox"> <property name="toolTip"> - <string>Select to activate the GPG extension</string> - </property> - <property name="text"> - <string>GPG</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QCheckBox" name="histeditCheckBox"> - <property name="toolTip"> - <string>Select to activate the histedit extension</string> + <string>Select to activate the rebase extension</string> </property> <property name="text"> - <string>Histedit</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QCheckBox" name="largefilesCheckBox"> - <property name="toolTip"> - <string>Select to activate the largefiles extension</string> - </property> - <property name="text"> - <string>Large Files</string> - </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QCheckBox" name="purgeCheckBox"> - <property name="toolTip"> - <string>Select to activate the Purge extension</string> - </property> - <property name="text"> - <string>Purge</string> + <string>Rebase</string> </property> </widget> </item> @@ -186,33 +156,53 @@ </property> </widget> </item> - <item row="3" column="0"> - <widget class="QCheckBox" name="rebaseCheckBox"> + <item row="2" column="0"> + <widget class="QCheckBox" name="largefilesCheckBox"> <property name="toolTip"> - <string>Select to activate the rebase extension</string> + <string>Select to activate the largefiles extension</string> + </property> + <property name="text"> + <string>Large Files</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QCheckBox" name="histeditCheckBox"> + <property name="toolTip"> + <string>Select to activate the histedit extension</string> </property> <property name="text"> - <string>Rebase</string> + <string>Histedit</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QCheckBox" name="gpgCheckBox"> + <property name="toolTip"> + <string>Select to activate the GPG extension</string> + </property> + <property name="text"> + <string>GPG</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QCheckBox" name="fastexportCheckBox"> + <property name="toolTip"> + <string>Select to activate the fastexport extension</string> + </property> + <property name="text"> + <string>Fastexport</string> </property> </widget> </item> <item row="3" column="1"> - <widget class="QCheckBox" name="shelveCheckBox"> + <widget class="QCheckBox" name="uncommitCheckBox"> <property name="toolTip"> - <string>Select to activate the shelve extension</string> + <string>Select to activate the uncommit extension</string> </property> <property name="text"> - <string>Shelve</string> - </property> - </widget> - </item> - <item row="4" column="0"> - <widget class="QCheckBox" name="stripCheckBox"> - <property name="toolTip"> - <string>Select to activate the strip extension</string> - </property> - <property name="text"> - <string>Strip</string> + <string>Uncommit</string> </property> </widget> </item> @@ -241,7 +231,7 @@ <string>Enter the minimum file size in MB for files to be treated as Large Files</string> </property> <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set> </property> <property name="suffix"> <string> MB</string> @@ -257,7 +247,7 @@ <item row="0" column="2"> <spacer name="horizontalSpacer"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <property name="sizeHint" stdset="0"> <size> @@ -303,7 +293,7 @@ </sizepolicy> </property> <property name="focusPolicy"> - <enum>Qt::StrongFocus</enum> + <enum>Qt::FocusPolicy::StrongFocus</enum> </property> <property name="toolTip"> <string>Enter the name of the user cache directory</string> @@ -316,7 +306,7 @@ <item> <spacer name="verticalSpacer_2"> <property name="orientation"> - <enum>Qt::Vertical</enum> + <enum>Qt::Orientation::Vertical</enum> </property> <property name="sizeHint" stdset="0"> <size> @@ -404,7 +394,7 @@ <string>Enter the password for the network proxy</string> </property> <property name="echoMode"> - <enum>QLineEdit::Password</enum> + <enum>QLineEdit::EchoMode::Password</enum> </property> <property name="placeholderText"> <string>Enter Proxy Password</string> @@ -443,7 +433,7 @@ <item> <spacer name="verticalSpacer_3"> <property name="orientation"> - <enum>Qt::Vertical</enum> + <enum>Qt::Orientation::Vertical</enum> </property> <property name="sizeHint" stdset="0"> <size> @@ -527,7 +517,7 @@ <item> <spacer name="verticalSpacer_4"> <property name="orientation"> - <enum>Qt::Vertical</enum> + <enum>Qt::Orientation::Vertical</enum> </property> <property name="sizeHint" stdset="0"> <size> @@ -568,7 +558,7 @@ <item> <spacer name="horizontalSpacer_2"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <property name="sizeHint" stdset="0"> <size> @@ -635,7 +625,7 @@ <item> <spacer name="verticalSpacer_5"> <property name="orientation"> - <enum>Qt::Vertical</enum> + <enum>Qt::Orientation::Vertical</enum> </property> <property name="sizeHint" stdset="0"> <size> @@ -667,10 +657,10 @@ <item> <widget class="QDialogButtonBox" name="buttonBox"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <property name="standardButtons"> - <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + <set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok</set> </property> </widget> </item> @@ -689,6 +679,13 @@ <tabstop>userNameEdit</tabstop> <tabstop>emailEdit</tabstop> <tabstop>closeheadCheckBox</tabstop> + <tabstop>fastexportCheckBox</tabstop> + <tabstop>gpgCheckBox</tabstop> + <tabstop>histeditCheckBox</tabstop> + <tabstop>largefilesCheckBox</tabstop> + <tabstop>queuesCheckBox</tabstop> + <tabstop>rebaseCheckBox</tabstop> + <tabstop>uncommitCheckBox</tabstop> <tabstop>lfFileSizeSpinBox</tabstop> <tabstop>lfFilePatternsEdit</tabstop> <tabstop>lfUserCachePicker</tabstop>
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -45,15 +45,10 @@ self.hashComboBox.addItem("") self.hashComboBox.addItems(HgUserConfigHostFingerprintDialog.supportedHashes) - if self.__version < (3, 9, 0): - self.hashLabel.setEnabled(False) - self.hashComboBox.setEnabled(False) - hashType = "sha1" + if fingerprint and fingerprint.startswith("sha"): + hashType, fingerprint = fingerprint.split(":", 1) else: - if fingerprint and fingerprint.startswith("sha"): - hashType, fingerprint = fingerprint.split(":", 1) - else: - hashType = "" + hashType = "" index = self.hashComboBox.findText(hashType) self.hashComboBox.setCurrentIndex(index) @@ -70,14 +65,14 @@ Private method to update the status of the Ok button. """ enabled = bool(self.hostEdit.text()) and bool(self.fingerprintEdit.text()) - if self.__version >= (3, 9, 0): - hashType = self.hashComboBox.currentText() - enabled &= bool(hashType) - if hashType: - enabled &= ( - len(self.fingerprintEdit.text().replace(":", "")) - == HgUserConfigHostFingerprintDialog.fingerprintLength[hashType] - ) + + hashType = self.hashComboBox.currentText() + enabled &= bool(hashType) + if hashType: + enabled &= ( + len(self.fingerprintEdit.text().replace(":", "")) + == HgUserConfigHostFingerprintDialog.fingerprintLength[hashType] + ) self.buttonBox.button(QDialogButtonBox.StandardButton.Ok).setEnabled(enabled) @@ -133,12 +128,8 @@ @return tuple containig the host name and the fingerprint @rtype tuple of two str """ - fingerprint = ( - self.fingerprintEdit.text() - if self.__version < (3, 9, 0) - else "{0}:{1}".format( - self.hashComboBox.currentText(), self.fingerprintEdit.text().strip() - ) + fingerprint = "{0}:{1}".format( + self.hashComboBox.currentText(), self.fingerprintEdit.text().strip() ) return self.hostEdit.text().strip(), fingerprint
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostMinimumProtocolDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostMinimumProtocolDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgUtilities.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgUtilities.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -14,6 +14,12 @@ from eric7.SystemUtilities import OSUtilities, PythonUtilities +# progress bar topic, bar (ignored), value, maximum, estimate +progressRe = re.compile(r"(\w+)\s+(?:\[[=> ]*\])\s+(\d+)/(\d+)\s+(\w+)") + +# version major, minor, patch, additional +versionRe = re.compile(r".*?(\d+)\.(\d+)\.?(\d+)?(\+[0-9a-f-]+)?") + def getHgExecutable(): """ @@ -67,7 +73,7 @@ @type str """ env = QProcessEnvironment.systemEnvironment() - env.insert("HGPLAIN", "1") + env.insert("HGPLAINEXCEPT", "progress") # maybe set to 'i18n,progress' # set the encoding for the process if encoding: @@ -110,11 +116,7 @@ "replace", ) versionStr = output.splitlines()[0].split()[-1][0:-1] - v = list( - re.match( - r".*?(\d+)\.(\d+)\.?(\d+)?(\+[0-9a-f-]+)?", versionStr - ).groups() - ) + v = list(versionRe.match(versionStr).groups()) if v[-1] is None: del v[-1] for i in range(3): @@ -140,3 +142,37 @@ ) return versionStr, version, errorMsg + + +def isProgressInfo(line): + """ + Function to check, if the given line contains progress information. + + @param line output line to be checked + @type str + @return flag indicating a line containing progress information + @rtype bool + """ + return progressRe.match(line.strip()) is not None + + +def parseProgressInfo(progressLine): + """ + Function to parse an output line containing progress information. + + @param progressLine progress information line to be parsed + @type str + @return tuple containing the progress topic, current value, maximum value and + the completion estimate + @rtype tuple of (str, int, int, str) + """ + match = progressRe.match(progressLine) + if match is not None: + return ( + match[1], # topic + int(match[2]), # value + int(match[3]), # maximum + match[4], # estimate + ) + else: + return "", 0, 0, ""
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditEditor.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditEditor.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -28,7 +28,7 @@ # 1. create the argument parser parser = argparse.ArgumentParser( description="Graphical editor for the Mercurial 'histedit' command.", - epilog="Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de>.", + epilog="Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de>.", ) # 2. add the arguments
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfConvertDataDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfConvertDataDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfRevisionsInputDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfRevisionsInputDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectBrowserHelper.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectBrowserHelper.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -91,7 +91,7 @@ """ return self.tr("Large Files") - def showExtensionMenu(self, key, controlled): + def showMenu(self, key, controlled): """ Public method to prepare the extension menu for display.
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,10 +1,10 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ -Module implementing the shelve extension project helper. +Module implementing the largefiles extension project helper. """ from PyQt6.QtWidgets import QMenu @@ -17,7 +17,7 @@ class LargefilesProjectHelper(HgExtensionProjectHelper): """ - Class implementing the queues extension project helper. + Class implementing the largefiles extension project helper. """ def __init__(self):
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/largefiles.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/largefiles.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -52,7 +52,8 @@ from .LargefilesExtension.ProjectBrowserHelper import ( LargefilesProjectBrowserHelper, ) - from .ShelveExtension.ProjectBrowserHelper import ShelveProjectBrowserHelper + from .ShelveBuiltin.ProjectBrowserHelper import ShelveProjectBrowserHelper + from .UncommitExtension.ProjectBrowserHelper import UncommitProjectBrowserHelper super().__init__( vcsObject, @@ -63,24 +64,50 @@ name, ) - # instantiate the extensions - self.__extensions = { + # instantiate interfaces for additional built-in functions + self.__builtins = { "shelve": ShelveProjectBrowserHelper( vcsObject, browserObject, projectObject ), + } + self.__builtinMenuTitles = { + self.__builtins[b].menuTitle(): b for b in self.__builtins + } + self.__builtinMenus = { + b: self.__builtins[b].initMenus() for b in self.__builtins + } + + # instantiate the extensions + self.__extensions = { "largefiles": LargefilesProjectBrowserHelper( vcsObject, browserObject, projectObject ), + "uncommit": UncommitProjectBrowserHelper( + vcsObject, browserObject, projectObject + ), } + self.__extensionMenuTitles = { + self.__extensions[e].menuTitle(): e for e in self.__extensions + } + self.__extensionMenus = { + e: self.__extensions[e].initMenus() for e in self.__extensions + } - self.__extensionMenuTitles = {} - for extension in self.__extensions: - self.__extensionMenuTitles[self.__extensions[extension].menuTitle()] = ( - extension - ) - self.__extensionMenus = {} - for extension in self.__extensions: - self.__extensionMenus[extension] = self.__extensions[extension].initMenus() + def __showBuiltinsMenu(self, key, controlled): + """ + Private slot showing the 'Other Functions' menu. + + @param key menu key (one of 'mainMenu', 'multiMenu', 'backMenu', 'dirMenu' + or 'dirMultiMenu') + @type str + @param controlled flag indicating to show the menu for a + version controlled entry or a non-version controlled entry + @type bool + """ + for builtinName in self.__builtinMenus: + if key in self.__builtinMenus[builtinName]: + # adjust individual extension menu entries + self.__builtins[builtinName].showMenu(key, controlled) def __showExtensionMenu(self, key, controlled): """ @@ -100,7 +127,7 @@ ) if self.__extensionMenus[extensionName][key].isEnabled(): # adjust individual extension menu entries - self.__extensions[extensionName].showExtensionMenu(key, controlled) + self.__extensions[extensionName].showMenu(key, controlled) if ( not self.__extensionMenus[extensionName][key].isEnabled() and self.__extensionMenus[extensionName][key].isTearOffMenuVisible() @@ -265,6 +292,32 @@ ## Private menu generation methods below ########################################################################### + def __addBuiltinsMenu(self, menu, key): + """ + Private method to add a 'Other Functions' menu entry. + + @param menu menu to add it to + @type QMenu + @param key menu key (one of 'mainMenu', 'multiMenu', 'backMenu', 'dirMenu' + or 'dirMultiMenu') + @type str + @return reference to the menu action + @rtype QAction + """ + act = None + if key in ["mainMenu", "multiMenu", "backMenu", "dirMenu", "dirMultiMenu"]: + builtinsMenu = QMenu(self.tr("Other Functions"), menu) + builtinsMenu.setTearOffEnabled(True) + for othersMenuTitle in sorted(self.__builtinMenuTitles): + builtinName = self.__builtinMenuTitles[othersMenuTitle] + if key in self.__builtinMenus[builtinName]: + builtinsMenu.addMenu(self.__builtinMenus[builtinName][key]) + if not builtinsMenu.isEmpty(): + if not menu.isEmpty(): + menu.addSeparator() + act = menu.addMenu(builtinsMenu) + return act + def __addExtensionsMenu(self, menu, key): """ Private method to add an extension menu entry. @@ -325,6 +378,7 @@ self._VCSCommit, ) self.vcsMenuActions.append(act) + self.__addBuiltinsMenu(menu, "mainMenu") self.__addExtensionsMenu(menu, "mainMenu") menu.addSeparator() act = menu.addAction( @@ -468,6 +522,7 @@ self._VCSCommit, ) self.vcsMultiMenuActions.append(act) + self.__addBuiltinsMenu(menu, "multiMenu") self.__addExtensionsMenu(menu, "multiMenu") menu.addSeparator() act = menu.addAction( @@ -621,6 +676,7 @@ self._VCSCommit, ) self.vcsDirMenuActions.append(act) + self.__addBuiltinsMenu(menu, "dirMenu") self.__addExtensionsMenu(menu, "dirMenu") menu.addSeparator() act = menu.addAction( @@ -735,6 +791,7 @@ self._VCSCommit, ) self.vcsDirMultiMenuActions.append(act) + self.__addBuiltinsMenu(menu, "dirMultiMenu") self.__addExtensionsMenu(menu, "dirMultiMenu") menu.addSeparator() act = menu.addAction(
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -38,35 +38,41 @@ @type str """ from .CloseheadExtension.ProjectHelper import CloseheadProjectHelper + from .FastexportExtension.ProjectHelper import FastexportProjectHelper from .GpgExtension.ProjectHelper import GpgProjectHelper from .HisteditExtension.ProjectHelper import HisteditProjectHelper from .LargefilesExtension.ProjectHelper import LargefilesProjectHelper - from .PurgeExtension.ProjectHelper import PurgeProjectHelper + from .PurgeBuiltin.ProjectHelper import PurgeProjectHelper from .QueuesExtension.ProjectHelper import QueuesProjectHelper from .RebaseExtension.ProjectHelper import RebaseProjectHelper - from .ShelveExtension.ProjectHelper import ShelveProjectHelper - from .StripExtension.ProjectHelper import StripProjectHelper + from .ShelveBuiltin.ProjectHelper import ShelveProjectHelper + from .UncommitExtension.ProjectHelper import UncommitProjectHelper super().__init__(vcsObject, projectObject, parent, name) + # instantiate interfaces for additional built-in functions + self.__builtins = { + "purge": PurgeProjectHelper(), + "shelve": ShelveProjectHelper(), + } + self.__builtinMenuTitles = { + self.__builtins[b].menuTitle(): b for b in self.__builtins + } + # instantiate the extensions self.__extensions = { - "mq": QueuesProjectHelper(), - "purge": PurgeProjectHelper(), + "closehead": CloseheadProjectHelper(), + "fastexport": FastexportProjectHelper(), "gpg": GpgProjectHelper(), - "rebase": RebaseProjectHelper(), - "shelve": ShelveProjectHelper(), - "largefiles": LargefilesProjectHelper(), - "strip": StripProjectHelper(), "histedit": HisteditProjectHelper(), - "closehead": CloseheadProjectHelper(), + "largefiles": LargefilesProjectHelper(), + "mq": QueuesProjectHelper(), + "rebase": RebaseProjectHelper(), + "uncommit": UncommitProjectHelper(), } - - self.__extensionMenuTitles = {} - for extension in self.__extensions: - self.__extensionMenuTitles[self.__extensions[extension].menuTitle()] = ( - extension - ) + self.__extensionMenuTitles = { + self.__extensions[e].menuTitle(): e for e in self.__extensions + } self.__toolbarManager = None @@ -82,6 +88,9 @@ self.vcs = vcsObject self.project = projectObject + for builtin in self.__builtins.values(): + builtin.setObjects(vcsObject, projectObject) + for extension in self.__extensions.values(): extension.setObjects(vcsObject, projectObject) @@ -1788,6 +1797,15 @@ bookmarksMenu.addAction(self.hgBookmarkPushAllAct) self.subMenus.append(bookmarksMenu) + self.__builtinsMenu = QMenu(self.tr("Other Functions"), menu) + self.__builtinsMenu.setTearOffEnabled(True) + self.__builtinMenus = {} + for builtinMenuTitle in sorted(self.__builtinMenuTitles): + builtinName = self.__builtinMenuTitles[builtinMenuTitle] + builtinMenu = self.__builtins[builtinName].initMenu(self.__builtinsMenu) + self.__builtinMenus[builtinName] = builtinMenu + self.__builtinsMenu.addMenu(builtinMenu) + self.__extensionsMenu = QMenu(self.tr("Extensions"), menu) self.__extensionsMenu.setTearOffEnabled(True) self.__extensionsMenu.aboutToShow.connect(self.__showExtensionMenu) @@ -1866,6 +1884,7 @@ menu.addAction(self.vcsDiffAct) menu.addAction(self.hgExtDiffAct) menu.addSeparator() + menu.addMenu(self.__builtinsMenu) menu.addMenu(self.__extensionsMenu) menu.addSeparator() menu.addAction(self.vcsSwitchAct)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/HgPurgeListDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,34 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to list all files not tracked by Mercurial. +""" + +from PyQt6.QtCore import Qt +from PyQt6.QtWidgets import QDialog + +from .Ui_HgPurgeListDialog import Ui_HgPurgeListDialog + + +class HgPurgeListDialog(QDialog, Ui_HgPurgeListDialog): + """ + Class implementing a dialog to list all files not tracked by Mercurial. + """ + + def __init__(self, entries, parent=None): + """ + Constructor + + @param entries list of entries to be shown + @type list of str + @param parent reference to the parent widget + @type QWidget + """ + super().__init__(parent) + self.setupUi(self) + self.setWindowFlags(Qt.WindowType.Window) + + self.purgeList.addItems(sorted(entries))
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/HgPurgeListDialog.ui Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,87 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>HgPurgeListDialog</class> + <widget class="QDialog" name="HgPurgeListDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>500</width> + <height>400</height> + </rect> + </property> + <property name="windowTitle"> + <string>Purge List</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QListWidget" name="purgeList"> + <property name="editTriggers"> + <set>QAbstractItemView::NoEditTriggers</set> + </property> + <property name="alternatingRowColors"> + <bool>true</bool> + </property> + <property name="selectionMode"> + <enum>QAbstractItemView::NoSelection</enum> + </property> + <property name="textElideMode"> + <enum>Qt::ElideLeft</enum> + </property> + </widget> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Close</set> + </property> + </widget> + </item> + </layout> + </widget> + <tabstops> + <tabstop>purgeList</tabstop> + <tabstop>buttonBox</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>HgPurgeListDialog</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>248</x> + <y>254</y> + </hint> + <hint type="destinationlabel"> + <x>157</x> + <y>274</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>HgPurgeListDialog</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>316</x> + <y>260</y> + </hint> + <hint type="destinationlabel"> + <x>286</x> + <y>274</y> + </hint> + </hints> + </connection> + </connections> +</ui>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,248 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing the purge extension project helper. +""" + +from PyQt6.QtWidgets import QMenu + +from eric7.EricGui import EricPixmapCache +from eric7.EricGui.EricAction import EricAction + +from ..HgExtensionProjectHelper import HgExtensionProjectHelper + + +class PurgeProjectHelper(HgExtensionProjectHelper): + """ + Class implementing the purge extension project helper. + """ + + def __init__(self): + """ + Constructor + """ + super().__init__() + + def initActions(self): + """ + Public method to generate the action objects. + """ + self.hgPurgeAct = EricAction( + self.tr("Purge Files"), + EricPixmapCache.getIcon("fileDelete"), + self.tr("Purge Files"), + 0, + 0, + self, + "mercurial_purge", + ) + self.hgPurgeAct.setStatusTip( + self.tr("Delete not version controlled files and directories") + ) + self.hgPurgeAct.setWhatsThis( + self.tr( + """<b>Purge Files</b>""" + """<p>This deletes not version controlled files and directories.""" + """ That means that purge will delete:<ul>""" + """<li>not version controlled files (marked with "not tracked" in""" + """ the status dialog)</li>""" + """<li>empty directories</li>""" + """</ul>Note that ignored files will be left untouched.</p>""" + ) + ) + self.hgPurgeAct.triggered.connect(self.__hgPurge) + self.actions.append(self.hgPurgeAct) + + self.hgPurgeAllAct = EricAction( + self.tr("Purge All Files"), + self.tr("Purge All Files"), + 0, + 0, + self, + "mercurial_purge_all", + ) + self.hgPurgeAllAct.setStatusTip( + self.tr( + "Delete not version controlled files and directories including" + " ignored ones" + ) + ) + self.hgPurgeAllAct.setWhatsThis( + self.tr( + """<b>Purge All Files</b>""" + """<p>This deletes not version controlled files and directories.""" + """ That means that purge will delete:<ul>""" + """<li>not version controlled files (marked with "not tracked" in""" + """ the status dialog)</li>""" + """<li>empty directories</li>""" + """<li>ignored files and directories</li>""" + """</ul></p>""" + ) + ) + self.hgPurgeAllAct.triggered.connect(self.__hgPurgeAll) + self.actions.append(self.hgPurgeAllAct) + + self.hgPurgeIgnoredAct = EricAction( + self.tr("Purge Ignored Files"), + self.tr("Purge Ignored Files"), + 0, + 0, + self, + "mercurial_purge_ignored", + ) + self.hgPurgeIgnoredAct.setStatusTip( + self.tr("Delete ignored files and directories") + ) + self.hgPurgeIgnoredAct.setWhatsThis( + self.tr( + """<b>Purge Ignored Files</b>""" + """<p>This deletes ignored files and directories.</p>""" + ) + ) + self.hgPurgeIgnoredAct.triggered.connect(self.__hgPurgeIgnored) + self.actions.append(self.hgPurgeIgnoredAct) + + self.hgPurgeListAct = EricAction( + self.tr("List Files to be Purged"), + EricPixmapCache.getIcon("fileDeleteList"), + self.tr("List Files to be Purged..."), + 0, + 0, + self, + "mercurial_purge_list", + ) + self.hgPurgeListAct.setStatusTip( + self.tr("List not version controlled files and directories") + ) + self.hgPurgeListAct.setWhatsThis( + self.tr( + """<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>""" + ) + ) + self.hgPurgeListAct.triggered.connect(self.__hgPurgeList) + self.actions.append(self.hgPurgeListAct) + + self.hgPurgeAllListAct = EricAction( + self.tr("List All Files to be Purged"), + self.tr("List All Files to be Purged..."), + 0, + 0, + self, + "mercurial_purge_all_list", + ) + self.hgPurgeAllListAct.setStatusTip( + self.tr( + "List not version controlled files and directories including" + " ignored ones" + ) + ) + self.hgPurgeAllListAct.setWhatsThis( + self.tr( + """<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>""" + ) + ) + self.hgPurgeAllListAct.triggered.connect(self.__hgPurgeAllList) + self.actions.append(self.hgPurgeAllListAct) + + self.hgPurgeIgnoredListAct = EricAction( + self.tr("List Ignored Files to be Purged"), + self.tr("List Ignored Files to be Purged..."), + 0, + 0, + self, + "mercurial_purge_ignored_list", + ) + self.hgPurgeIgnoredListAct.setStatusTip( + self.tr("List ignored files and directories") + ) + self.hgPurgeIgnoredListAct.setWhatsThis( + self.tr( + """<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>""" + ) + ) + self.hgPurgeIgnoredListAct.triggered.connect(self.__hgPurgeIgnoredList) + self.actions.append(self.hgPurgeIgnoredListAct) + + def initMenu(self, mainMenu): + """ + Public method to generate the extension menu. + + @param mainMenu reference to the main menu + @type QMenu + @return populated menu + @rtype QMenu + """ + menu = QMenu(self.menuTitle(), mainMenu) + menu.setIcon(EricPixmapCache.getIcon("fileDelete")) + menu.setTearOffEnabled(True) + + menu.addAction(self.hgPurgeListAct) + menu.addAction(self.hgPurgeAllListAct) + menu.addAction(self.hgPurgeIgnoredListAct) + menu.addSeparator() + menu.addAction(self.hgPurgeAct) + menu.addAction(self.hgPurgeAllAct) + menu.addAction(self.hgPurgeIgnoredAct) + + return menu + + def menuTitle(self): + """ + Public method to get the menu title. + + @return title of the menu + @rtype str + """ + return self.tr("Purge") + + def __hgPurge(self): + """ + Private slot used to remove not version controlled files. + """ + self.vcs.getBuiltinObject("purge").hgPurge(deleteAll=False, ignoredOnly=False) + + def __hgPurgeAll(self): + """ + Private slot used to remove not version controlled files including ignored ones. + """ + self.vcs.getBuiltinObject("purge").hgPurge(deleteAll=True, ignoredOnly=False) + + def __hgPurgeIgnored(self): + """ + Private slot used to remove ignored files. + """ + self.vcs.getBuiltinObject("purge").hgPurge(deleteAll=False, ignoredOnly=True) + + def __hgPurgeList(self): + """ + Private slot used to list not version controlled files. + """ + self.vcs.getBuiltinObject("purge").hgPurgeList( + deleteAll=False, ignoredOnly=False + ) + + def __hgPurgeAllList(self): + """ + Private slot used to list not version controlled files including ignored ones. + """ + self.vcs.getBuiltinObject("purge").hgPurgeList( + deleteAll=True, ignoredOnly=False + ) + + def __hgPurgeIgnoredList(self): + """ + Private slot used to list ignored files. + """ + self.vcs.getBuiltinObject("purge").hgPurgeList( + deleteAll=False, ignoredOnly=True + )
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/Ui_HgPurgeListDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,40 @@ +# Form implementation generated from reading ui file 'src/eric7/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/HgPurgeListDialog.ui' +# +# Created by: PyQt6 UI code generator 6.7.0 +# +# WARNING: Any manual changes made to this file will be lost when pyuic6 is +# run again. Do not edit this file unless you know what you are doing. + + +from PyQt6 import QtCore, QtGui, QtWidgets + + +class Ui_HgPurgeListDialog(object): + def setupUi(self, HgPurgeListDialog): + HgPurgeListDialog.setObjectName("HgPurgeListDialog") + HgPurgeListDialog.resize(500, 400) + HgPurgeListDialog.setSizeGripEnabled(True) + self.verticalLayout = QtWidgets.QVBoxLayout(HgPurgeListDialog) + self.verticalLayout.setObjectName("verticalLayout") + self.purgeList = QtWidgets.QListWidget(parent=HgPurgeListDialog) + self.purgeList.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers) + self.purgeList.setAlternatingRowColors(True) + self.purgeList.setSelectionMode(QtWidgets.QAbstractItemView.SelectionMode.NoSelection) + self.purgeList.setTextElideMode(QtCore.Qt.TextElideMode.ElideLeft) + self.purgeList.setObjectName("purgeList") + self.verticalLayout.addWidget(self.purgeList) + self.buttonBox = QtWidgets.QDialogButtonBox(parent=HgPurgeListDialog) + self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal) + self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Close) + self.buttonBox.setObjectName("buttonBox") + self.verticalLayout.addWidget(self.buttonBox) + + self.retranslateUi(HgPurgeListDialog) + self.buttonBox.accepted.connect(HgPurgeListDialog.accept) # type: ignore + self.buttonBox.rejected.connect(HgPurgeListDialog.reject) # type: ignore + QtCore.QMetaObject.connectSlotsByName(HgPurgeListDialog) + HgPurgeListDialog.setTabOrder(self.purgeList, self.buttonBox) + + def retranslateUi(self, HgPurgeListDialog): + _translate = QtCore.QCoreApplication.translate + HgPurgeListDialog.setWindowTitle(_translate("HgPurgeListDialog", "Purge List"))
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,8 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Package implementing the purge extension support interface. +"""
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/purge.py Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,124 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing the purge extension interface. +""" + +from PyQt6.QtWidgets import QDialog + +from eric7.UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog + +from ..HgDialog import HgDialog +from ..HgExtension import HgExtension + + +class Purge(HgExtension): + """ + Class implementing the purge extension interface. + """ + + def __init__(self, vcs, ui=None): + """ + Constructor + + @param vcs reference to the Mercurial vcs object + @type Hg + @param ui reference to a UI widget (defaults to None) + @type QWidget + """ + super().__init__(vcs, ui=ui) + + self.purgeListDialog = None + + def shutdown(self): + """ + Public method used to shutdown the purge interface. + """ + if self.purgeListDialog is not None: + self.purgeListDialog.close() + + def __getEntries(self, deleteAll, ignoredOnly): + """ + Private method to get a list of files/directories about to be purged. + + @param deleteAll flag indicating to delete all files including ignored + ones + @type bool + @param ignoredOnly flag indicating to delete ignored files only + @type bool + @return name of the current patch + @rtype str + """ + purgeEntries = [] + + args = self.vcs.initCommand("purge") + args.extend(["--print", "--no-confirm"]) + if deleteAll: + args.append("--all") + elif ignoredOnly: + args.append("--ignored") + + client = self.vcs.getClient() + out, _err = client.runcommand(args) + if out: + purgeEntries = out.strip().split() + + return purgeEntries + + def hgPurge(self, deleteAll=False, ignoredOnly=False): + """ + Public method to purge files and directories not tracked by Mercurial. + + @param deleteAll flag indicating to delete all files including ignored + ones (defaults to False) + @type bool (optional) + @param ignoredOnly flag indicating to delete ignored files only (defaults + to False) + @type bool (optional) + """ + if deleteAll: + title = self.tr("Purge All Files") + message = self.tr( + """Do really want to delete all files not tracked by""" + """ Mercurial (including ignored ones)?""" + ) + else: + title = self.tr("Purge Files") + message = self.tr( + """Do really want to delete files not tracked by Mercurial?""" + ) + entries = self.__getEntries(deleteAll, ignoredOnly) + dlg = DeleteFilesConfirmationDialog(self.ui, title, message, entries) + if dlg.exec() == QDialog.DialogCode.Accepted: + args = self.vcs.initCommand("purge") + args.append("--no-confirm") + if deleteAll: + args.append("--all") + elif ignoredOnly: + args.append("--ignored") + args.append("-v") + + dia = HgDialog(title, hg=self.vcs, parent=self.ui) + res = dia.startProcess(args) + if res: + dia.exec() + + def hgPurgeList(self, deleteAll=False, ignoredOnly=False): + """ + Public method to list files and directories not tracked by Mercurial. + + @param deleteAll flag indicating to delete all files including ignored + ones (defaults to False) + @type bool (optional) + @param ignoredOnly flag indicating to delete ignored files only (defaults + to False) + @type bool (optional) + """ + from .HgPurgeListDialog import HgPurgeListDialog + + entries = self.__getEntries(deleteAll, ignoredOnly) + self.purgeListDialog = HgPurgeListDialog(entries) + self.purgeListDialog.show()
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/HgPurgeListDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,34 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> -# - -""" -Module implementing a dialog to list all files not tracked by Mercurial. -""" - -from PyQt6.QtCore import Qt -from PyQt6.QtWidgets import QDialog - -from .Ui_HgPurgeListDialog import Ui_HgPurgeListDialog - - -class HgPurgeListDialog(QDialog, Ui_HgPurgeListDialog): - """ - Class implementing a dialog to list all files not tracked by Mercurial. - """ - - def __init__(self, entries, parent=None): - """ - Constructor - - @param entries list of entries to be shown - @type list of str - @param parent reference to the parent widget - @type QWidget - """ - super().__init__(parent) - self.setupUi(self) - self.setWindowFlags(Qt.WindowType.Window) - - self.purgeList.addItems(sorted(entries))
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/HgPurgeListDialog.ui Sat Nov 30 11:09:02 2024 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,87 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ui version="4.0"> - <class>HgPurgeListDialog</class> - <widget class="QDialog" name="HgPurgeListDialog"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>500</width> - <height>400</height> - </rect> - </property> - <property name="windowTitle"> - <string>Purge List</string> - </property> - <property name="sizeGripEnabled"> - <bool>true</bool> - </property> - <layout class="QVBoxLayout" name="verticalLayout"> - <item> - <widget class="QListWidget" name="purgeList"> - <property name="editTriggers"> - <set>QAbstractItemView::NoEditTriggers</set> - </property> - <property name="alternatingRowColors"> - <bool>true</bool> - </property> - <property name="selectionMode"> - <enum>QAbstractItemView::NoSelection</enum> - </property> - <property name="textElideMode"> - <enum>Qt::ElideLeft</enum> - </property> - </widget> - </item> - <item> - <widget class="QDialogButtonBox" name="buttonBox"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="standardButtons"> - <set>QDialogButtonBox::Close</set> - </property> - </widget> - </item> - </layout> - </widget> - <tabstops> - <tabstop>purgeList</tabstop> - <tabstop>buttonBox</tabstop> - </tabstops> - <resources/> - <connections> - <connection> - <sender>buttonBox</sender> - <signal>accepted()</signal> - <receiver>HgPurgeListDialog</receiver> - <slot>accept()</slot> - <hints> - <hint type="sourcelabel"> - <x>248</x> - <y>254</y> - </hint> - <hint type="destinationlabel"> - <x>157</x> - <y>274</y> - </hint> - </hints> - </connection> - <connection> - <sender>buttonBox</sender> - <signal>rejected()</signal> - <receiver>HgPurgeListDialog</receiver> - <slot>reject()</slot> - <hints> - <hint type="sourcelabel"> - <x>316</x> - <y>260</y> - </hint> - <hint type="destinationlabel"> - <x>286</x> - <y>274</y> - </hint> - </hints> - </connection> - </connections> -</ui>
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py Sat Nov 30 11:09:02 2024 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,187 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> -# - -""" -Module implementing the purge extension project helper. -""" - -from PyQt6.QtWidgets import QMenu - -from eric7.EricGui import EricPixmapCache -from eric7.EricGui.EricAction import EricAction - -from ..HgExtensionProjectHelper import HgExtensionProjectHelper - - -class PurgeProjectHelper(HgExtensionProjectHelper): - """ - Class implementing the purge extension project helper. - """ - - def __init__(self): - """ - Constructor - """ - super().__init__() - - def initActions(self): - """ - Public method to generate the action objects. - """ - self.hgPurgeAct = EricAction( - self.tr("Purge Files"), - EricPixmapCache.getIcon("fileDelete"), - self.tr("Purge Files"), - 0, - 0, - self, - "mercurial_purge", - ) - self.hgPurgeAct.setStatusTip( - self.tr("Delete files and directories not known to Mercurial") - ) - self.hgPurgeAct.setWhatsThis( - self.tr( - """<b>Purge Files</b>""" - """<p>This deletes files and directories not known to Mercurial.""" - """ That means that purge will delete:<ul>""" - """<li>unknown files (marked with "not tracked" in the status""" - """ dialog)</li>""" - """<li>empty directories</li>""" - """</ul>Note that ignored files will be left untouched.</p>""" - ) - ) - self.hgPurgeAct.triggered.connect(self.__hgPurge) - self.actions.append(self.hgPurgeAct) - - self.hgPurgeAllAct = EricAction( - self.tr("Purge All Files"), - self.tr("Purge All Files"), - 0, - 0, - self, - "mercurial_purge_all", - ) - self.hgPurgeAllAct.setStatusTip( - self.tr( - "Delete files and directories not known to Mercurial including" - " ignored ones" - ) - ) - self.hgPurgeAllAct.setWhatsThis( - self.tr( - """<b>Purge All Files</b>""" - """<p>This deletes files and directories not known to Mercurial.""" - """ That means that purge will delete:<ul>""" - """<li>unknown files (marked with "not tracked" in the status""" - """ dialog)</li>""" - """<li>empty directories</li>""" - """<li>ignored files and directories</li>""" - """</ul></p>""" - ) - ) - self.hgPurgeAllAct.triggered.connect(self.__hgPurgeAll) - self.actions.append(self.hgPurgeAllAct) - - self.hgPurgeListAct = EricAction( - self.tr("List Files to be Purged"), - EricPixmapCache.getIcon("fileDeleteList"), - self.tr("List Files to be Purged..."), - 0, - 0, - self, - "mercurial_purge_list", - ) - self.hgPurgeListAct.setStatusTip( - self.tr("List files and directories not known to Mercurial") - ) - self.hgPurgeListAct.setWhatsThis( - self.tr( - """<b>List Files to be Purged</b>""" - """<p>This lists files and directories not known to Mercurial.""" - """ These would be deleted by the "Purge Files" menu entry.</p>""" - ) - ) - self.hgPurgeListAct.triggered.connect(self.__hgPurgeList) - self.actions.append(self.hgPurgeListAct) - - self.hgPurgeAllListAct = EricAction( - self.tr("List All Files to be Purged"), - self.tr("List All Files to be Purged..."), - 0, - 0, - self, - "mercurial_purge_all_list", - ) - self.hgPurgeAllListAct.setStatusTip( - self.tr( - "List files and directories not known to Mercurial including" - " ignored ones" - ) - ) - self.hgPurgeAllListAct.setWhatsThis( - self.tr( - """<b>List All Files to be Purged</b>""" - """<p>This lists files and directories not known to Mercurial""" - """ including ignored ones. These would be deleted by the""" - """ "Purge All Files" menu entry.</p>""" - ) - ) - self.hgPurgeAllListAct.triggered.connect(self.__hgPurgeAllList) - self.actions.append(self.hgPurgeAllListAct) - - def initMenu(self, mainMenu): - """ - Public method to generate the extension menu. - - @param mainMenu reference to the main menu - @type QMenu - @return populated menu - @rtype QMenu - """ - menu = QMenu(self.menuTitle(), mainMenu) - menu.setIcon(EricPixmapCache.getIcon("fileDelete")) - menu.setTearOffEnabled(True) - - menu.addAction(self.hgPurgeAct) - menu.addAction(self.hgPurgeAllAct) - menu.addSeparator() - menu.addAction(self.hgPurgeListAct) - menu.addAction(self.hgPurgeAllListAct) - - return menu - - def menuTitle(self): - """ - Public method to get the menu title. - - @return title of the menu - @rtype str - """ - return self.tr("Purge") - - def __hgPurge(self): - """ - Private slot used to remove files not tracked by Mercurial. - """ - self.vcs.getExtensionObject("purge").hgPurge(deleteAll=False) - - def __hgPurgeAll(self): - """ - Private slot used to remove all files not tracked by Mercurial. - """ - self.vcs.getExtensionObject("purge").hgPurge(deleteAll=True) - - def __hgPurgeList(self): - """ - Private slot used to list files not tracked by Mercurial. - """ - self.vcs.getExtensionObject("purge").hgPurgeList(deleteAll=False) - - def __hgPurgeAllList(self): - """ - Private slot used to list all files not tracked by Mercurial. - """ - self.vcs.getExtensionObject("purge").hgPurgeList(deleteAll=True)
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/Ui_HgPurgeListDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,40 +0,0 @@ -# Form implementation generated from reading ui file 'src/eric7/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/HgPurgeListDialog.ui' -# -# Created by: PyQt6 UI code generator 6.7.0 -# -# WARNING: Any manual changes made to this file will be lost when pyuic6 is -# run again. Do not edit this file unless you know what you are doing. - - -from PyQt6 import QtCore, QtGui, QtWidgets - - -class Ui_HgPurgeListDialog(object): - def setupUi(self, HgPurgeListDialog): - HgPurgeListDialog.setObjectName("HgPurgeListDialog") - HgPurgeListDialog.resize(500, 400) - HgPurgeListDialog.setSizeGripEnabled(True) - self.verticalLayout = QtWidgets.QVBoxLayout(HgPurgeListDialog) - self.verticalLayout.setObjectName("verticalLayout") - self.purgeList = QtWidgets.QListWidget(parent=HgPurgeListDialog) - self.purgeList.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers) - self.purgeList.setAlternatingRowColors(True) - self.purgeList.setSelectionMode(QtWidgets.QAbstractItemView.SelectionMode.NoSelection) - self.purgeList.setTextElideMode(QtCore.Qt.TextElideMode.ElideLeft) - self.purgeList.setObjectName("purgeList") - self.verticalLayout.addWidget(self.purgeList) - self.buttonBox = QtWidgets.QDialogButtonBox(parent=HgPurgeListDialog) - self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal) - self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Close) - self.buttonBox.setObjectName("buttonBox") - self.verticalLayout.addWidget(self.buttonBox) - - self.retranslateUi(HgPurgeListDialog) - self.buttonBox.accepted.connect(HgPurgeListDialog.accept) # type: ignore - self.buttonBox.rejected.connect(HgPurgeListDialog.reject) # type: ignore - QtCore.QMetaObject.connectSlotsByName(HgPurgeListDialog) - HgPurgeListDialog.setTabOrder(self.purgeList, self.buttonBox) - - def retranslateUi(self, HgPurgeListDialog): - _translate = QtCore.QCoreApplication.translate - HgPurgeListDialog.setWindowTitle(_translate("HgPurgeListDialog", "Purge List"))
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> -# - -""" -Package implementing the purge extension support interface. -"""
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py Sat Nov 30 11:09:02 2024 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,111 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> -# - -""" -Module implementing the purge extension interface. -""" - -from PyQt6.QtWidgets import QDialog - -from eric7.UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog - -from ..HgDialog import HgDialog -from ..HgExtension import HgExtension - - -class Purge(HgExtension): - """ - Class implementing the purge extension interface. - """ - - def __init__(self, vcs, ui=None): - """ - Constructor - - @param vcs reference to the Mercurial vcs object - @type Hg - @param ui reference to a UI widget (defaults to None) - @type QWidget - """ - super().__init__(vcs, ui=ui) - - self.purgeListDialog = None - - def shutdown(self): - """ - Public method used to shutdown the purge interface. - """ - if self.purgeListDialog is not None: - self.purgeListDialog.close() - - def __getEntries(self, deleteAll): - """ - Private method to get a list of files/directories being purged. - - @param deleteAll flag indicating to delete all files including ignored - ones - @type bool - @return name of the current patch - @rtype str - """ - purgeEntries = [] - - args = self.vcs.initCommand("purge") - args.append("--print") - if deleteAll: - args.append("--all") - - client = self.vcs.getClient() - out, _err = client.runcommand(args) - if out: - purgeEntries = out.strip().split() - - return purgeEntries - - def hgPurge(self, deleteAll=False): - """ - Public method to purge files and directories not tracked by Mercurial. - - @param deleteAll flag indicating to delete all files including ignored - ones - @type bool - """ - if deleteAll: - title = self.tr("Purge All Files") - message = self.tr( - """Do really want to delete all files not tracked by""" - """ Mercurial (including ignored ones)?""" - ) - else: - title = self.tr("Purge Files") - message = self.tr( - """Do really want to delete files not tracked by Mercurial?""" - ) - entries = self.__getEntries(deleteAll) - dlg = DeleteFilesConfirmationDialog(self.ui, title, message, entries) - if dlg.exec() == QDialog.DialogCode.Accepted: - args = self.vcs.initCommand("purge") - if deleteAll: - args.append("--all") - args.append("-v") - - dia = HgDialog(title, hg=self.vcs, parent=self.ui) - res = dia.startProcess(args) - if res: - dia.exec() - - def hgPurgeList(self, deleteAll=False): - """ - Public method to list files and directories not tracked by Mercurial. - - @param deleteAll flag indicating to list all files including ignored - ones - @type bool - """ - from .HgPurgeListDialog import HgPurgeListDialog - - entries = self.__getEntries(deleteAll) - self.purgeListDialog = HgPurgeListDialog(entries) - self.purgeListDialog.show()
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesFoldDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesFoldDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesGuardsSelectionDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesGuardsSelectionDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesNewPatchDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesNewPatchDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesRenamePatchDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesRenamePatchDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,355 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing Mercurial shelve browser dialog. +""" + +from PyQt6.QtCore import QPoint, Qt, pyqtSlot +from PyQt6.QtWidgets import ( + QAbstractButton, + QApplication, + QDialogButtonBox, + QHeaderView, + QMenu, + QTreeWidgetItem, + QWidget, +) + +from eric7.EricGui.EricOverrideCursor import EricOverrideCursor + +from .Ui_HgShelveBrowserDialog import Ui_HgShelveBrowserDialog + + +class HgShelveBrowserDialog(QWidget, Ui_HgShelveBrowserDialog): + """ + Class implementing Mercurial shelve browser dialog. + """ + + NameColumn = 0 + AgeColumn = 1 + MessageColumn = 2 + + def __init__(self, vcs, parent=None): + """ + Constructor + + @param vcs reference to the vcs object + @type Hg + @param parent parent widget + @type QWidget + """ + super().__init__(parent) + self.setupUi(self) + + self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setEnabled(False) + self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setDefault(True) + + self.__position = QPoint() + + self.__fileStatisticsRole = Qt.ItemDataRole.UserRole + self.__totalStatisticsRole = Qt.ItemDataRole.UserRole + 1 + + self.shelveList.header().setSortIndicator(0, Qt.SortOrder.AscendingOrder) + + self.refreshButton = self.buttonBox.addButton( + self.tr("&Refresh"), QDialogButtonBox.ButtonRole.ActionRole + ) + self.refreshButton.setToolTip(self.tr("Press to refresh the list of shelves")) + self.refreshButton.setEnabled(False) + + self.vcs = vcs + self.__hgClient = vcs.getClient() + self.__resetUI() + + self.__contextMenu = QMenu() + self.__unshelveAct = self.__contextMenu.addAction( + self.tr("Restore selected shelve"), self.__unshelve + ) + self.__deleteAct = self.__contextMenu.addAction( + self.tr("Delete selected shelves"), self.__deleteShelves + ) + self.__contextMenu.addAction( + self.tr("Delete all shelves"), self.__cleanupShelves + ) + + def closeEvent(self, e): + """ + Protected slot implementing a close event handler. + + @param e close event + @type QCloseEvent + """ + if self.__hgClient.isExecuting(): + self.__hgClient.cancel() + + self.__position = self.pos() + + e.accept() + + def show(self): + """ + Public slot to show the dialog. + """ + if not self.__position.isNull(): + self.move(self.__position) + self.__resetUI() + + super().show() + + def __resetUI(self): + """ + Private method to reset the user interface. + """ + self.shelveList.clear() + + def __resizeColumnsShelves(self): + """ + Private method to resize the shelve list columns. + """ + self.shelveList.header().resizeSections(QHeaderView.ResizeMode.ResizeToContents) + self.shelveList.header().setStretchLastSection(True) + + def __generateShelveEntry(self, name, age, message, fileStatistics, totals): + """ + Private method to generate the shelve items. + + @param name name of the shelve + @type str + @param age age of the shelve + @type str + @param message shelve message + @type str + @param fileStatistics per file change statistics (tuple containing the + file name, the number of changes, the number of added lines and the + number of deleted lines) + @type tuple of (str, str, str, str) + @param totals overall statistics (tuple containing the number of changed files, + the number of added lines and the number of deleted lines) + @type tuple of (str, str, str) + """ + itm = QTreeWidgetItem(self.shelveList, [name, age, message]) + itm.setData(0, self.__fileStatisticsRole, fileStatistics) + itm.setData(0, self.__totalStatisticsRole, totals) + + def __getShelveEntries(self): + """ + Private method to retrieve the list of shelves. + """ + self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setEnabled(False) + self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setEnabled(True) + self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setDefault(True) + QApplication.processEvents() + + self.buf = [] + self.errors.clear() + self.intercept = False + + args = self.vcs.initCommand("shelve") + args.append("--list") + args.append("--stat") + + with EricOverrideCursor(): + out, err = self.__hgClient.runcommand(args) + self.buf = out.splitlines(True) + if err: + self.__showError(err) + self.__processBuffer() + self.__finish() + + def start(self): + """ + Public slot to start the hg shelve command. + """ + self.errorGroup.hide() + QApplication.processEvents() + + self.activateWindow() + self.raise_() + + self.shelveList.clear() + self.__started = True + self.__getShelveEntries() + + def __finish(self): + """ + Private slot called when the process finished or the user pressed + the button. + """ + self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setEnabled(True) + self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setEnabled(False) + self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setDefault(True) + + self.refreshButton.setEnabled(True) + + def __processBuffer(self): + """ + Private method to process the buffered output of the hg shelve command. + """ + lastWasFileStats = False + firstLine = True + itemData = {} + for line in self.buf: + if firstLine: + name, line = line.split("(", 1) + age, message = line.split(")", 1) + itemData["name"] = name.strip() + itemData["age"] = age.strip() + itemData["message"] = message.strip() + itemData["files"] = [] + firstLine = False + elif "|" in line: + # file stats: foo.py | 3 ++- + file, changes = line.strip().split("|", 1) + if changes.strip().endswith(("+", "-")): + total, addDelete = changes.strip().split(None, 1) + additions = str(addDelete.count("+")) + deletions = str(addDelete.count("-")) + else: + total = changes.strip() + additions = "0" + deletions = "0" + itemData["files"].append((file, total, additions, deletions)) + lastWasFileStats = True + elif lastWasFileStats: + # summary line + # 2 files changed, 15 insertions(+), 1 deletions(-) + total, added, deleted = line.strip().split(",", 2) + total = total.split()[0] + added = added.split()[0] + deleted = deleted.split()[0] + itemData["summary"] = (total, added, deleted) + + self.__generateShelveEntry( + itemData["name"], + itemData["age"], + itemData["message"], + itemData["files"], + itemData["summary"], + ) + + lastWasFileStats = False + firstLine = True + itemData = {} + + self.__resizeColumnsShelves() + + if self.__started: + self.shelveList.setCurrentItem(self.shelveList.topLevelItem(0)) + self.__started = False + + def __showError(self, out): + """ + Private slot to show some error. + + @param out error to be shown + @type str + """ + self.errorGroup.show() + self.errors.insertPlainText(out) + self.errors.ensureCursorVisible() + + @pyqtSlot(QAbstractButton) + def on_buttonBox_clicked(self, button): + """ + Private slot called by a button of the button box clicked. + + @param button button that was clicked + @type QAbstractButton + """ + if button == self.buttonBox.button(QDialogButtonBox.StandardButton.Close): + self.close() + elif button == self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel): + self.cancelled = True + self.__hgClient.cancel() + elif button == self.refreshButton: + self.on_refreshButton_clicked() + + @pyqtSlot(QTreeWidgetItem, QTreeWidgetItem) + def on_shelveList_currentItemChanged(self, current, _previous): + """ + Private slot called, when the current item of the shelve list changes. + + @param current reference to the new current item + @type QTreeWidgetItem + @param _previous reference to the old current item (unused) + @type QTreeWidgetItem + """ + self.statisticsList.clear() + if current: + for dataSet in current.data(0, self.__fileStatisticsRole): + QTreeWidgetItem(self.statisticsList, list(dataSet)) + self.statisticsList.header().resizeSections( + QHeaderView.ResizeMode.ResizeToContents + ) + self.statisticsList.header().setStretchLastSection(True) + + totals = current.data(0, self.__totalStatisticsRole) + self.filesLabel.setText(self.tr("%n file(s) changed", None, int(totals[0]))) + self.insertionsLabel.setText( + self.tr("%n line(s) inserted", None, int(totals[1])) + ) + self.deletionsLabel.setText( + self.tr("%n line(s) deleted", None, int(totals[2])) + ) + else: + self.filesLabel.setText("") + self.insertionsLabel.setText("") + self.deletionsLabel.setText("") + + @pyqtSlot(QPoint) + def on_shelveList_customContextMenuRequested(self, pos): + """ + Private slot to show the context menu of the shelve list. + + @param pos position of the mouse pointer + @type QPoint + """ + selectedItemsCount = len(self.shelveList.selectedItems()) + self.__unshelveAct.setEnabled(selectedItemsCount == 1) + self.__deleteAct.setEnabled(selectedItemsCount > 0) + + self.__contextMenu.popup(self.mapToGlobal(pos)) + + @pyqtSlot() + def on_refreshButton_clicked(self): + """ + Private slot to refresh the list of shelves. + """ + self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setEnabled(False) + self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setEnabled(True) + self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setDefault(True) + + self.refreshButton.setEnabled(False) + + self.start() + + def __unshelve(self): + """ + Private slot to restore the selected shelve of changes. + """ + itm = self.shelveList.selectedItems()[0] + if itm is not None: + name = itm.text(self.NameColumn) + self.vcs.getBuiltinObject("shelve").hgUnshelve(shelveName=name) + self.on_refreshButton_clicked() + + def __deleteShelves(self): + """ + Private slot to delete the selected shelves. + """ + shelveNames = [] + for itm in self.shelveList.selectedItems(): + shelveNames.append(itm.text(self.NameColumn)) + if shelveNames: + self.vcs.getBuiltinObject("shelve").hgDeleteShelves(shelveNames=shelveNames) + self.on_refreshButton_clicked() + + def __cleanupShelves(self): + """ + Private slot to delete all shelves. + """ + self.vcs.getBuiltinObject("shelve").hgCleanupShelves() + self.on_refreshButton_clicked()
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,192 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>HgShelveBrowserDialog</class> + <widget class="QWidget" name="HgShelveBrowserDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>650</width> + <height>574</height> + </rect> + </property> + <property name="windowTitle"> + <string>Mercurial Shelve Browser</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <widget class="QTreeWidget" name="shelveList"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>5</verstretch> + </sizepolicy> + </property> + <property name="contextMenuPolicy"> + <enum>Qt::CustomContextMenu</enum> + </property> + <property name="alternatingRowColors"> + <bool>true</bool> + </property> + <property name="selectionMode"> + <enum>QAbstractItemView::ExtendedSelection</enum> + </property> + <property name="rootIsDecorated"> + <bool>false</bool> + </property> + <property name="itemsExpandable"> + <bool>false</bool> + </property> + <property name="sortingEnabled"> + <bool>true</bool> + </property> + <column> + <property name="text"> + <string>Name</string> + </property> + </column> + <column> + <property name="text"> + <string>Age</string> + </property> + </column> + <column> + <property name="text"> + <string>Message</string> + </property> + </column> + </widget> + </item> + <item> + <widget class="QGroupBox" name="groupBox"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>4</verstretch> + </sizepolicy> + </property> + <property name="title"> + <string>Statistics</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QTreeWidget" name="statisticsList"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>2</verstretch> + </sizepolicy> + </property> + <property name="alternatingRowColors"> + <bool>true</bool> + </property> + <property name="selectionMode"> + <enum>QAbstractItemView::NoSelection</enum> + </property> + <property name="rootIsDecorated"> + <bool>false</bool> + </property> + <property name="itemsExpandable"> + <bool>false</bool> + </property> + <column> + <property name="text"> + <string>File</string> + </property> + </column> + <column> + <property name="text"> + <string>Changes</string> + </property> + </column> + <column> + <property name="text"> + <string>Lines added</string> + </property> + </column> + <column> + <property name="text"> + <string>Lines deleted</string> + </property> + </column> + <column> + <property name="text"> + <string/> + </property> + </column> + </widget> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QLabel" name="filesLabel"> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="insertionsLabel"> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="deletionsLabel"> + <property name="text"> + <string/> + </property> + </widget> + </item> + </layout> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="errorGroup"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>1</verstretch> + </sizepolicy> + </property> + <property name="title"> + <string>Errors</string> + </property> + <layout class="QVBoxLayout"> + <item> + <widget class="QTextEdit" name="errors"> + <property name="whatsThis"> + <string><b>Mercurial shelve errors</b><p>This shows possible error messages of the hg shelve command.</p></string> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="acceptRichText"> + <bool>false</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Close</set> + </property> + </widget> + </item> + </layout> + </widget> + <tabstops> + <tabstop>shelveList</tabstop> + <tabstop>statisticsList</tabstop> + <tabstop>errors</tabstop> + <tabstop>buttonBox</tabstop> + </tabstops> + <resources/> + <connections/> +</ui>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,63 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to enter the data for a shelve operation. +""" + +from PyQt6.QtCore import QDateTime +from PyQt6.QtWidgets import QDialog + +from .Ui_HgShelveDataDialog import Ui_HgShelveDataDialog + + +class HgShelveDataDialog(QDialog, Ui_HgShelveDataDialog): + """ + Class implementing a dialog to enter the data for a shelve operation. + """ + + def __init__(self, version, parent=None): + """ + Constructor + + @param version Mercurial version + @type tuple of three int + @param parent reference to the parent widget + @type QWidget + """ + super().__init__(parent) + self.setupUi(self) + + self.__initialDateTime = QDateTime.currentDateTime() + self.dateTimeEdit.setDateTime(self.__initialDateTime) + + if version < (5, 0, 0): + self.keepCheckBox.setChecked(False) + self.keepCheckBox.hide() + + msh = self.minimumSizeHint() + self.resize(max(self.width(), msh.width()), msh.height()) + + def getData(self): + """ + Public method to get the user data. + + @return tuple containing the name, date, message, a flag indicating + to add/remove new/missing files and a flag indicating to keep the + shelved changes in the working directory + @rtype tuple of (str, QDateTime, str, bool, bool) + """ + dateTime = ( + self.dateTimeEdit.dateTime() + if self.dateTimeEdit.dateTime() != self.__initialDateTime + else QDateTime() + ) + return ( + self.nameEdit.text().replace(" ", "_"), + dateTime, + self.messageEdit.text(), + self.addRemoveCheckBox.isChecked(), + self.keepCheckBox.isChecked(), + )
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>HgShelveDataDialog</class> + <widget class="QDialog" name="HgShelveDataDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>500</width> + <height>167</height> + </rect> + </property> + <property name="windowTitle"> + <string>Shelve</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Name:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QLineEdit" name="nameEdit"> + <property name="toolTip"> + <string>Enter a name for the shelve</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>Date, Time:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QDateTimeEdit" name="dateTimeEdit"> + <property name="statusTip"> + <string>Enter the commit date and time for the shelve</string> + </property> + <property name="displayFormat"> + <string>yyyy-MM-dd HH:mm</string> + </property> + <property name="calendarPopup"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>198</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>Message:</string> + </property> + <property name="alignment"> + <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QLineEdit" name="messageEdit"> + <property name="toolTip"> + <string>Enter a message for the shelve</string> + </property> + </widget> + </item> + <item row="3" column="0" colspan="2"> + <widget class="QCheckBox" name="addRemoveCheckBox"> + <property name="text"> + <string>Mark new/missing files as added/removed</string> + </property> + </widget> + </item> + <item row="4" column="0" colspan="2"> + <widget class="QCheckBox" name="keepCheckBox"> + <property name="toolTip"> + <string>Select to shelve, but keep the changes in the working directory</string> + </property> + <property name="text"> + <string>Shelve, but keep changes</string> + </property> + </widget> + </item> + <item row="5" column="0" colspan="2"> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + </property> + </widget> + </item> + </layout> + </widget> + <tabstops> + <tabstop>nameEdit</tabstop> + <tabstop>dateTimeEdit</tabstop> + <tabstop>messageEdit</tabstop> + <tabstop>addRemoveCheckBox</tabstop> + <tabstop>buttonBox</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>HgShelveDataDialog</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>248</x> + <y>254</y> + </hint> + <hint type="destinationlabel"> + <x>157</x> + <y>274</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>HgShelveDataDialog</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>316</x> + <y>260</y> + </hint> + <hint type="destinationlabel"> + <x>286</x> + <y>274</y> + </hint> + </hints> + </connection> + </connections> +</ui>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelvesSelectionDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,60 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to select multiple shelve names. +""" + +from PyQt6.QtCore import pyqtSlot +from PyQt6.QtWidgets import QDialog, QDialogButtonBox + +from .Ui_HgShelvesSelectionDialog import Ui_HgShelvesSelectionDialog + + +class HgShelvesSelectionDialog(QDialog, Ui_HgShelvesSelectionDialog): + """ + Class implementing a dialog to select multiple shelve names. + """ + + def __init__(self, message, shelveNames, parent=None): + """ + Constructor + + @param message message to be shown + @type str + @param shelveNames list of shelve names + @type list of str + @param parent reference to the parent widget + @type QWidget + """ + super().__init__(parent) + self.setupUi(self) + + self.message.setText(message) + self.shelvesList.addItems(shelveNames) + + self.buttonBox.button(QDialogButtonBox.StandardButton.Ok).setEnabled(False) + + @pyqtSlot() + def on_shelvesList_itemSelectionChanged(self): + """ + Private slot to enabled the OK button if items have been selected. + """ + self.buttonBox.button(QDialogButtonBox.StandardButton.Ok).setEnabled( + len(self.shelvesList.selectedItems()) > 0 + ) + + def getSelectedShelves(self): + """ + Public method to retrieve the selected shelve names. + + @return selected shelve names + @rtype list of str + """ + names = [] + for itm in self.shelvesList.selectedItems(): + names.append(itm.text()) + + return names
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelvesSelectionDialog.ui Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,91 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>HgShelvesSelectionDialog</class> + <widget class="QDialog" name="HgShelvesSelectionDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>400</width> + <height>300</height> + </rect> + </property> + <property name="windowTitle"> + <string>Mercurial Shelve Selection</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QLabel" name="message"> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item> + <widget class="QListWidget" name="shelvesList"> + <property name="alternatingRowColors"> + <bool>true</bool> + </property> + <property name="selectionMode"> + <enum>QAbstractItemView::ExtendedSelection</enum> + </property> + <property name="sortingEnabled"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + </property> + </widget> + </item> + </layout> + </widget> + <tabstops> + <tabstop>shelvesList</tabstop> + <tabstop>buttonBox</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>HgShelvesSelectionDialog</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>248</x> + <y>254</y> + </hint> + <hint type="destinationlabel"> + <x>157</x> + <y>274</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>HgShelvesSelectionDialog</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>316</x> + <y>260</y> + </hint> + <hint type="destinationlabel"> + <x>286</x> + <y>274</y> + </hint> + </hints> + </connection> + </connections> +</ui>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,54 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to enter the data for an unshelve operation. +""" + +from PyQt6.QtWidgets import QDialog + +from .Ui_HgUnshelveDataDialog import Ui_HgUnshelveDataDialog + + +class HgUnshelveDataDialog(QDialog, Ui_HgUnshelveDataDialog): + """ + Class implementing a dialog to enter the data for an unshelve operation. + """ + + def __init__(self, shelveNames, shelveName="", parent=None): + """ + Constructor + + @param shelveNames list of available shelves + @type list of str + @param shelveName name of the shelve to restore + @type str + @param parent reference to the parent widget + @type QWidget + """ + super().__init__(parent) + self.setupUi(self) + + self.nameComboBox.addItem("") + self.nameComboBox.addItems(sorted(shelveNames)) + + if shelveName and shelveName in shelveNames: + self.nameComboBox.setCurrentIndex(self.nameComboBox.findText(shelveName)) + + msh = self.minimumSizeHint() + self.resize(max(self.width(), msh.width()), msh.height()) + + def getData(self): + """ + Public method to get the user data. + + @return tuple containing the name and a flag indicating to keep the + shelved change + @rtype tuple of (str, bool) + """ + return ( + self.nameComboBox.currentText().replace(" ", "_"), + self.keepCheckBox.isChecked(), + )
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,105 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>HgUnshelveDataDialog</class> + <widget class="QDialog" name="HgUnshelveDataDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>400</width> + <height>108</height> + </rect> + </property> + <property name="windowTitle"> + <string>Mercurial Unshelve</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Name:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QComboBox" name="nameComboBox"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Enter the name of the shelve</string> + </property> + <property name="editable"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="1" column="0" colspan="2"> + <widget class="QCheckBox" name="keepCheckBox"> + <property name="toolTip"> + <string>Select to keep the shelved change</string> + </property> + <property name="text"> + <string>Keep shelved change</string> + </property> + </widget> + </item> + <item row="2" column="0" colspan="2"> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + </property> + </widget> + </item> + </layout> + </widget> + <tabstops> + <tabstop>nameComboBox</tabstop> + <tabstop>keepCheckBox</tabstop> + <tabstop>buttonBox</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>HgUnshelveDataDialog</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>248</x> + <y>254</y> + </hint> + <hint type="destinationlabel"> + <x>157</x> + <y>274</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>HgUnshelveDataDialog</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>316</x> + <y>260</y> + </hint> + <hint type="destinationlabel"> + <x>286</x> + <y>274</y> + </hint> + </hints> + </connection> + </connections> +</ui>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,122 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing the shelve extension project browser helper. +""" + +from PyQt6.QtWidgets import QMenu + +from eric7.EricWidgets import EricMessageBox + +from ..HgExtensionProjectBrowserHelper import HgExtensionProjectBrowserHelper + + +class ShelveProjectBrowserHelper(HgExtensionProjectBrowserHelper): + """ + Class implementing the shelve extension project browser helper. + """ + + def __init__(self, vcsObject, browserObject, projectObject): + """ + Constructor + + @param vcsObject reference to the vcs object + @type Hg + @param browserObject reference to the project browser object + @type ProjectBaseBrowser + @param projectObject reference to the project object + @type Project + """ + super().__init__(vcsObject, browserObject, projectObject) + + def initMenus(self): + """ + Public method to generate the extension menus. + + @return dictionary of populated menu. The dict must have the keys 'mainMenu', + 'multiMenu', 'backMenu', 'dirMenu' and 'dirMultiMenu'. + @rtype dict of QMenu + """ + self.__menus = {} + + menu = QMenu(self.menuTitle()) + menu.setTearOffEnabled(True) + menu.addAction(self.tr("Shelve changes"), self.__hgShelve) + self.__menus["mainMenu"] = menu + + menu = QMenu(self.menuTitle()) + menu.setTearOffEnabled(True) + menu.addAction(self.tr("Shelve changes"), self.__hgShelve) + self.__menus["multiMenu"] = menu + + menu = QMenu(self.menuTitle()) + menu.setTearOffEnabled(True) + menu.addAction(self.tr("Shelve changes"), self.__hgShelve) + self.__menus["dirMenu"] = menu + + menu = QMenu(self.menuTitle()) + menu.setTearOffEnabled(True) + menu.addAction(self.tr("Shelve changes"), self.__hgShelve) + self.__menus["dirMultiMenu"] = menu + + return self.__menus + + def menuTitle(self): + """ + Public method to get the menu title. + + @return title of the menu + @rtype str + """ + return self.tr("Shelve") + + def showMenu(self, key, controlled): + """ + Public method to prepare the extension menu for display. + + @param key menu key (one of 'mainMenu', 'multiMenu', 'backMenu', 'dirMenu' + or 'dirMultiMenu') + @type str + @param controlled flag indicating to prepare the menu for a + version controlled entry or a non-version controlled entry + @type bool + """ + if key in self.__menus: + self.__menus[key].setEnabled(controlled) + + def __reopenProject(self, shouldReopen, title): + """ + Private method to reopen the project if needed and wanted. + + @param shouldReopen flag indicating that the project should + be reopened + @type bool + @param title title of the message box + @type str + """ + if shouldReopen: + res = EricMessageBox.yesNo( + None, + title, + self.tr("""The project should be reread. Do this now?"""), + yesDefault=True, + ) + if res: + self.project.reopenProject() + + def __hgShelve(self): + """ + Private slot used to shelve all current changes. + """ + names = [] + for itm in self.browser.getSelectedItems(): + try: + name = itm.fileName() + except AttributeError: + name = itm.dirName() + names.append(name) + shouldReopen = self.vcs.getBuiltinObject("shelve").hgShelve(names) + self.__reopenProject(shouldReopen, self.tr("Shelve"))
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,270 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing the shelve extension project helper. +""" + +from PyQt6.QtWidgets import QMenu + +from eric7.EricGui.EricAction import EricAction +from eric7.EricWidgets import EricMessageBox + +from ..HgExtensionProjectHelper import HgExtensionProjectHelper + + +class ShelveProjectHelper(HgExtensionProjectHelper): + """ + Class implementing the shelve extension project helper. + """ + + def __init__(self): + """ + Constructor + """ + super().__init__() + + def initActions(self): + """ + Public method to generate the action objects. + """ + self.hgShelveAct = EricAction( + self.tr("Shelve changes"), + self.tr("Shelve changes..."), + 0, + 0, + self, + "mercurial_shelve", + ) + self.hgShelveAct.setStatusTip( + self.tr("Shelve all current changes of the project") + ) + self.hgShelveAct.setWhatsThis( + self.tr( + """<b>Shelve changes</b>""" + """<p>This shelves all current changes of the project.</p>""" + ) + ) + self.hgShelveAct.triggered.connect(self.__hgShelve) + self.actions.append(self.hgShelveAct) + + self.hgShelveBrowserAct = EricAction( + self.tr("Show shelve browser"), + self.tr("Show shelve browser..."), + 0, + 0, + self, + "mercurial_shelve_browser", + ) + self.hgShelveBrowserAct.setStatusTip(self.tr("Show a dialog with all shelves")) + self.hgShelveBrowserAct.setWhatsThis( + self.tr( + """<b>Show shelve browser...</b>""" + """<p>This shows a dialog listing all available shelves.""" + """ Actions on these shelves may be executed via the""" + """ context menu.</p>""" + ) + ) + self.hgShelveBrowserAct.triggered.connect(self.__hgShelveBrowser) + self.actions.append(self.hgShelveBrowserAct) + + self.hgUnshelveAct = EricAction( + self.tr("Restore shelved change"), + self.tr("Restore shelved change..."), + 0, + 0, + self, + "mercurial_unshelve", + ) + self.hgUnshelveAct.setStatusTip( + self.tr("Restore a shelved change to the project directory") + ) + self.hgUnshelveAct.setWhatsThis( + self.tr( + """<b>Restore shelved change</b>""" + """<p>This restore a shelved change to the project directory.""" + """</p>""" + ) + ) + self.hgUnshelveAct.triggered.connect(self.__hgUnshelve) + self.actions.append(self.hgUnshelveAct) + + self.hgUnshelveAbortAct = EricAction( + self.tr("Abort restore"), + self.tr("Abort restore..."), + 0, + 0, + self, + "mercurial_unshelve_abort", + ) + self.hgUnshelveAbortAct.setStatusTip( + self.tr("Abort the restore operation in progress") + ) + self.hgUnshelveAbortAct.setWhatsThis( + self.tr( + """<b>Abort restore</b>""" + """<p>This aborts the restore operation in progress and reverts""" + """ already applied changes.</p>""" + ) + ) + self.hgUnshelveAbortAct.triggered.connect(self.__hgUnshelveAbort) + self.actions.append(self.hgUnshelveAbortAct) + + self.hgUnshelveContinueAct = EricAction( + self.tr("Continue restore"), + self.tr("Continue restore..."), + 0, + 0, + self, + "mercurial_unshelve_continue", + ) + self.hgUnshelveContinueAct.setStatusTip( + self.tr("Continue the restore operation in progress") + ) + self.hgUnshelveContinueAct.setWhatsThis( + self.tr( + """<b>Continue restore</b>""" + """<p>This continues the restore operation in progress.</p>""" + ) + ) + self.hgUnshelveContinueAct.triggered.connect(self.__hgUnshelveContinue) + self.actions.append(self.hgUnshelveContinueAct) + + self.hgShelveDeleteAct = EricAction( + self.tr("Delete shelved changes"), + self.tr("Delete shelved changes..."), + 0, + 0, + self, + "mercurial_shelve_delete", + ) + self.hgShelveDeleteAct.setWhatsThis( + self.tr( + """<b>Delete shelved changes...</b>""" + """<p>This opens a dialog to select the shelved changes to""" + """ delete and deletes the selected ones.</p>""" + ) + ) + self.hgShelveDeleteAct.triggered.connect(self.__hgDeleteShelves) + self.actions.append(self.hgShelveDeleteAct) + + self.hgShelveCleanupAct = EricAction( + self.tr("Delete ALL shelved changes"), + self.tr("Delete ALL shelved changes"), + 0, + 0, + self, + "mercurial_shelve_cleanup", + ) + self.hgShelveCleanupAct.setWhatsThis( + self.tr( + """<b>Delete ALL shelved changes</b>""" + """<p>This deletes all shelved changes.</p>""" + ) + ) + self.hgShelveCleanupAct.triggered.connect(self.__hgCleanupShelves) + self.actions.append(self.hgShelveCleanupAct) + + def initMenu(self, mainMenu): + """ + Public method to generate the extension menu. + + @param mainMenu reference to the main menu + @type QMenu + @return populated menu + @rtype QMenu + """ + menu = QMenu(self.menuTitle(), mainMenu) + menu.setTearOffEnabled(True) + + menu.addAction(self.hgShelveAct) + menu.addSeparator() + menu.addAction(self.hgShelveBrowserAct) + menu.addSeparator() + menu.addAction(self.hgUnshelveAct) + menu.addAction(self.hgUnshelveContinueAct) + menu.addAction(self.hgUnshelveAbortAct) + menu.addSeparator() + menu.addAction(self.hgShelveDeleteAct) + menu.addAction(self.hgShelveCleanupAct) + + return menu + + def menuTitle(self): + """ + Public method to get the menu title. + + @return title of the menu + @rtype str + """ + return self.tr("Shelve") + + def __reopenProject(self, shouldReopen, title): + """ + Private method to reopen the project if needed and wanted. + + @param shouldReopen flag indicating that the project should + be reopened + @type bool + @param title title of the message box + @type str + """ + if shouldReopen: + res = EricMessageBox.yesNo( + None, + title, + self.tr("""The project should be reread. Do this now?"""), + yesDefault=True, + ) + if res: + self.project.reopenProject() + + def __hgShelve(self): + """ + Private slot used to shelve all current changes. + """ + shouldReopen = self.vcs.getBuiltinObject("shelve").hgShelve( + self.project.getProjectPath() + ) + self.__reopenProject(shouldReopen, self.tr("Shelve")) + + def __hgShelveBrowser(self): + """ + Private slot to show the shelve browser dialog. + """ + self.vcs.getBuiltinObject("shelve").hgShelveBrowser() + + def __hgUnshelve(self): + """ + Private slot used to restore a shelved change. + """ + shouldReopen = self.vcs.getBuiltinObject("shelve").hgUnshelve() + self.__reopenProject(shouldReopen, self.tr("Unshelve")) + + def __hgUnshelveAbort(self): + """ + Private slot used to abort an ongoing restore operation. + """ + shouldReopen = self.vcs.getBuiltinObject("shelve").hgUnshelveAbort() + self.__reopenProject(shouldReopen, self.tr("Abort Unshelve")) + + def __hgUnshelveContinue(self): + """ + Private slot used to continue an ongoing restore operation. + """ + shouldReopen = self.vcs.getBuiltinObject("shelve").hgUnshelveContinue() + self.__reopenProject(shouldReopen, self.tr("Continue Unshelve")) + + def __hgDeleteShelves(self): + """ + Private slot to delete selected shelves. + """ + self.vcs.getBuiltinObject("shelve").hgDeleteShelves() + + def __hgCleanupShelves(self): + """ + Private slot to delete all shelves. + """ + self.vcs.getBuiltinObject("shelve").hgCleanupShelves()
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/Ui_HgShelveBrowserDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,107 @@ +# Form implementation generated from reading ui file 'src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui' +# +# Created by: PyQt6 UI code generator 6.7.0 +# +# WARNING: Any manual changes made to this file will be lost when pyuic6 is +# run again. Do not edit this file unless you know what you are doing. + + +from PyQt6 import QtCore, QtGui, QtWidgets + + +class Ui_HgShelveBrowserDialog(object): + def setupUi(self, HgShelveBrowserDialog): + HgShelveBrowserDialog.setObjectName("HgShelveBrowserDialog") + HgShelveBrowserDialog.resize(650, 574) + self.verticalLayout_2 = QtWidgets.QVBoxLayout(HgShelveBrowserDialog) + self.verticalLayout_2.setObjectName("verticalLayout_2") + self.shelveList = QtWidgets.QTreeWidget(parent=HgShelveBrowserDialog) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Expanding) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(5) + sizePolicy.setHeightForWidth(self.shelveList.sizePolicy().hasHeightForWidth()) + self.shelveList.setSizePolicy(sizePolicy) + self.shelveList.setContextMenuPolicy(QtCore.Qt.ContextMenuPolicy.CustomContextMenu) + self.shelveList.setAlternatingRowColors(True) + self.shelveList.setSelectionMode(QtWidgets.QAbstractItemView.SelectionMode.ExtendedSelection) + self.shelveList.setRootIsDecorated(False) + self.shelveList.setItemsExpandable(False) + self.shelveList.setObjectName("shelveList") + self.verticalLayout_2.addWidget(self.shelveList) + self.groupBox = QtWidgets.QGroupBox(parent=HgShelveBrowserDialog) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(4) + sizePolicy.setHeightForWidth(self.groupBox.sizePolicy().hasHeightForWidth()) + self.groupBox.setSizePolicy(sizePolicy) + self.groupBox.setObjectName("groupBox") + self.verticalLayout = QtWidgets.QVBoxLayout(self.groupBox) + self.verticalLayout.setObjectName("verticalLayout") + self.statisticsList = QtWidgets.QTreeWidget(parent=self.groupBox) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Expanding) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(2) + sizePolicy.setHeightForWidth(self.statisticsList.sizePolicy().hasHeightForWidth()) + self.statisticsList.setSizePolicy(sizePolicy) + self.statisticsList.setAlternatingRowColors(True) + self.statisticsList.setSelectionMode(QtWidgets.QAbstractItemView.SelectionMode.NoSelection) + self.statisticsList.setRootIsDecorated(False) + self.statisticsList.setItemsExpandable(False) + self.statisticsList.setObjectName("statisticsList") + self.verticalLayout.addWidget(self.statisticsList) + self.horizontalLayout = QtWidgets.QHBoxLayout() + self.horizontalLayout.setObjectName("horizontalLayout") + self.filesLabel = QtWidgets.QLabel(parent=self.groupBox) + self.filesLabel.setText("") + self.filesLabel.setObjectName("filesLabel") + self.horizontalLayout.addWidget(self.filesLabel) + self.insertionsLabel = QtWidgets.QLabel(parent=self.groupBox) + self.insertionsLabel.setText("") + self.insertionsLabel.setObjectName("insertionsLabel") + self.horizontalLayout.addWidget(self.insertionsLabel) + self.deletionsLabel = QtWidgets.QLabel(parent=self.groupBox) + self.deletionsLabel.setText("") + self.deletionsLabel.setObjectName("deletionsLabel") + self.horizontalLayout.addWidget(self.deletionsLabel) + self.verticalLayout.addLayout(self.horizontalLayout) + self.verticalLayout_2.addWidget(self.groupBox) + self.errorGroup = QtWidgets.QGroupBox(parent=HgShelveBrowserDialog) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Expanding) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(1) + sizePolicy.setHeightForWidth(self.errorGroup.sizePolicy().hasHeightForWidth()) + self.errorGroup.setSizePolicy(sizePolicy) + self.errorGroup.setObjectName("errorGroup") + self.vboxlayout = QtWidgets.QVBoxLayout(self.errorGroup) + self.vboxlayout.setObjectName("vboxlayout") + self.errors = QtWidgets.QTextEdit(parent=self.errorGroup) + self.errors.setReadOnly(True) + self.errors.setAcceptRichText(False) + self.errors.setObjectName("errors") + self.vboxlayout.addWidget(self.errors) + self.verticalLayout_2.addWidget(self.errorGroup) + self.buttonBox = QtWidgets.QDialogButtonBox(parent=HgShelveBrowserDialog) + self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Close) + self.buttonBox.setObjectName("buttonBox") + self.verticalLayout_2.addWidget(self.buttonBox) + + self.retranslateUi(HgShelveBrowserDialog) + QtCore.QMetaObject.connectSlotsByName(HgShelveBrowserDialog) + HgShelveBrowserDialog.setTabOrder(self.shelveList, self.statisticsList) + HgShelveBrowserDialog.setTabOrder(self.statisticsList, self.errors) + HgShelveBrowserDialog.setTabOrder(self.errors, self.buttonBox) + + def retranslateUi(self, HgShelveBrowserDialog): + _translate = QtCore.QCoreApplication.translate + HgShelveBrowserDialog.setWindowTitle(_translate("HgShelveBrowserDialog", "Mercurial Shelve Browser")) + self.shelveList.setSortingEnabled(True) + self.shelveList.headerItem().setText(0, _translate("HgShelveBrowserDialog", "Name")) + self.shelveList.headerItem().setText(1, _translate("HgShelveBrowserDialog", "Age")) + self.shelveList.headerItem().setText(2, _translate("HgShelveBrowserDialog", "Message")) + self.groupBox.setTitle(_translate("HgShelveBrowserDialog", "Statistics")) + self.statisticsList.headerItem().setText(0, _translate("HgShelveBrowserDialog", "File")) + self.statisticsList.headerItem().setText(1, _translate("HgShelveBrowserDialog", "Changes")) + self.statisticsList.headerItem().setText(2, _translate("HgShelveBrowserDialog", "Lines added")) + self.statisticsList.headerItem().setText(3, _translate("HgShelveBrowserDialog", "Lines deleted")) + self.errorGroup.setTitle(_translate("HgShelveBrowserDialog", "Errors")) + self.errors.setWhatsThis(_translate("HgShelveBrowserDialog", "<b>Mercurial shelve errors</b><p>This shows possible error messages of the hg shelve command.</p>"))
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/Ui_HgShelveDataDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,77 @@ +# Form implementation generated from reading ui file 'src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui' +# +# Created by: PyQt6 UI code generator 6.7.0 +# +# WARNING: Any manual changes made to this file will be lost when pyuic6 is +# run again. Do not edit this file unless you know what you are doing. + + +from PyQt6 import QtCore, QtGui, QtWidgets + + +class Ui_HgShelveDataDialog(object): + def setupUi(self, HgShelveDataDialog): + HgShelveDataDialog.setObjectName("HgShelveDataDialog") + HgShelveDataDialog.resize(500, 167) + HgShelveDataDialog.setSizeGripEnabled(True) + self.gridLayout = QtWidgets.QGridLayout(HgShelveDataDialog) + self.gridLayout.setObjectName("gridLayout") + self.label = QtWidgets.QLabel(parent=HgShelveDataDialog) + self.label.setObjectName("label") + self.gridLayout.addWidget(self.label, 0, 0, 1, 1) + self.nameEdit = QtWidgets.QLineEdit(parent=HgShelveDataDialog) + self.nameEdit.setObjectName("nameEdit") + self.gridLayout.addWidget(self.nameEdit, 0, 1, 1, 1) + self.label_2 = QtWidgets.QLabel(parent=HgShelveDataDialog) + self.label_2.setObjectName("label_2") + self.gridLayout.addWidget(self.label_2, 1, 0, 1, 1) + self.horizontalLayout = QtWidgets.QHBoxLayout() + self.horizontalLayout.setObjectName("horizontalLayout") + self.dateTimeEdit = QtWidgets.QDateTimeEdit(parent=HgShelveDataDialog) + self.dateTimeEdit.setCalendarPopup(True) + self.dateTimeEdit.setObjectName("dateTimeEdit") + self.horizontalLayout.addWidget(self.dateTimeEdit) + spacerItem = QtWidgets.QSpacerItem(198, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + self.horizontalLayout.addItem(spacerItem) + self.gridLayout.addLayout(self.horizontalLayout, 1, 1, 1, 1) + self.label_3 = QtWidgets.QLabel(parent=HgShelveDataDialog) + self.label_3.setAlignment(QtCore.Qt.AlignmentFlag.AlignLeading|QtCore.Qt.AlignmentFlag.AlignLeft|QtCore.Qt.AlignmentFlag.AlignTop) + self.label_3.setObjectName("label_3") + self.gridLayout.addWidget(self.label_3, 2, 0, 1, 1) + self.messageEdit = QtWidgets.QLineEdit(parent=HgShelveDataDialog) + self.messageEdit.setObjectName("messageEdit") + self.gridLayout.addWidget(self.messageEdit, 2, 1, 1, 1) + self.addRemoveCheckBox = QtWidgets.QCheckBox(parent=HgShelveDataDialog) + self.addRemoveCheckBox.setObjectName("addRemoveCheckBox") + self.gridLayout.addWidget(self.addRemoveCheckBox, 3, 0, 1, 2) + self.keepCheckBox = QtWidgets.QCheckBox(parent=HgShelveDataDialog) + self.keepCheckBox.setObjectName("keepCheckBox") + self.gridLayout.addWidget(self.keepCheckBox, 4, 0, 1, 2) + self.buttonBox = QtWidgets.QDialogButtonBox(parent=HgShelveDataDialog) + self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal) + self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok) + self.buttonBox.setObjectName("buttonBox") + self.gridLayout.addWidget(self.buttonBox, 5, 0, 1, 2) + + self.retranslateUi(HgShelveDataDialog) + self.buttonBox.accepted.connect(HgShelveDataDialog.accept) # type: ignore + self.buttonBox.rejected.connect(HgShelveDataDialog.reject) # type: ignore + QtCore.QMetaObject.connectSlotsByName(HgShelveDataDialog) + HgShelveDataDialog.setTabOrder(self.nameEdit, self.dateTimeEdit) + HgShelveDataDialog.setTabOrder(self.dateTimeEdit, self.messageEdit) + HgShelveDataDialog.setTabOrder(self.messageEdit, self.addRemoveCheckBox) + HgShelveDataDialog.setTabOrder(self.addRemoveCheckBox, self.buttonBox) + + def retranslateUi(self, HgShelveDataDialog): + _translate = QtCore.QCoreApplication.translate + HgShelveDataDialog.setWindowTitle(_translate("HgShelveDataDialog", "Shelve")) + self.label.setText(_translate("HgShelveDataDialog", "Name:")) + self.nameEdit.setToolTip(_translate("HgShelveDataDialog", "Enter a name for the shelve")) + self.label_2.setText(_translate("HgShelveDataDialog", "Date, Time:")) + self.dateTimeEdit.setStatusTip(_translate("HgShelveDataDialog", "Enter the commit date and time for the shelve")) + self.dateTimeEdit.setDisplayFormat(_translate("HgShelveDataDialog", "yyyy-MM-dd HH:mm")) + self.label_3.setText(_translate("HgShelveDataDialog", "Message:")) + self.messageEdit.setToolTip(_translate("HgShelveDataDialog", "Enter a message for the shelve")) + self.addRemoveCheckBox.setText(_translate("HgShelveDataDialog", "Mark new/missing files as added/removed")) + self.keepCheckBox.setToolTip(_translate("HgShelveDataDialog", "Select to shelve, but keep the changes in the working directory")) + self.keepCheckBox.setText(_translate("HgShelveDataDialog", "Shelve, but keep changes"))
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/Ui_HgShelvesSelectionDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,43 @@ +# Form implementation generated from reading ui file 'src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelvesSelectionDialog.ui' +# +# Created by: PyQt6 UI code generator 6.7.0 +# +# WARNING: Any manual changes made to this file will be lost when pyuic6 is +# run again. Do not edit this file unless you know what you are doing. + + +from PyQt6 import QtCore, QtGui, QtWidgets + + +class Ui_HgShelvesSelectionDialog(object): + def setupUi(self, HgShelvesSelectionDialog): + HgShelvesSelectionDialog.setObjectName("HgShelvesSelectionDialog") + HgShelvesSelectionDialog.resize(400, 300) + HgShelvesSelectionDialog.setSizeGripEnabled(True) + self.verticalLayout = QtWidgets.QVBoxLayout(HgShelvesSelectionDialog) + self.verticalLayout.setObjectName("verticalLayout") + self.message = QtWidgets.QLabel(parent=HgShelvesSelectionDialog) + self.message.setText("") + self.message.setObjectName("message") + self.verticalLayout.addWidget(self.message) + self.shelvesList = QtWidgets.QListWidget(parent=HgShelvesSelectionDialog) + self.shelvesList.setAlternatingRowColors(True) + self.shelvesList.setSelectionMode(QtWidgets.QAbstractItemView.SelectionMode.ExtendedSelection) + self.shelvesList.setObjectName("shelvesList") + self.verticalLayout.addWidget(self.shelvesList) + self.buttonBox = QtWidgets.QDialogButtonBox(parent=HgShelvesSelectionDialog) + self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal) + self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok) + self.buttonBox.setObjectName("buttonBox") + self.verticalLayout.addWidget(self.buttonBox) + + self.retranslateUi(HgShelvesSelectionDialog) + self.buttonBox.accepted.connect(HgShelvesSelectionDialog.accept) # type: ignore + self.buttonBox.rejected.connect(HgShelvesSelectionDialog.reject) # type: ignore + QtCore.QMetaObject.connectSlotsByName(HgShelvesSelectionDialog) + HgShelvesSelectionDialog.setTabOrder(self.shelvesList, self.buttonBox) + + def retranslateUi(self, HgShelvesSelectionDialog): + _translate = QtCore.QCoreApplication.translate + HgShelvesSelectionDialog.setWindowTitle(_translate("HgShelvesSelectionDialog", "Mercurial Shelve Selection")) + self.shelvesList.setSortingEnabled(True)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/Ui_HgUnshelveDataDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,53 @@ +# Form implementation generated from reading ui file 'src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui' +# +# Created by: PyQt6 UI code generator 6.7.0 +# +# WARNING: Any manual changes made to this file will be lost when pyuic6 is +# run again. Do not edit this file unless you know what you are doing. + + +from PyQt6 import QtCore, QtGui, QtWidgets + + +class Ui_HgUnshelveDataDialog(object): + def setupUi(self, HgUnshelveDataDialog): + HgUnshelveDataDialog.setObjectName("HgUnshelveDataDialog") + HgUnshelveDataDialog.resize(400, 108) + HgUnshelveDataDialog.setSizeGripEnabled(True) + self.gridLayout = QtWidgets.QGridLayout(HgUnshelveDataDialog) + self.gridLayout.setObjectName("gridLayout") + self.label = QtWidgets.QLabel(parent=HgUnshelveDataDialog) + self.label.setObjectName("label") + self.gridLayout.addWidget(self.label, 0, 0, 1, 1) + self.nameComboBox = QtWidgets.QComboBox(parent=HgUnshelveDataDialog) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.nameComboBox.sizePolicy().hasHeightForWidth()) + self.nameComboBox.setSizePolicy(sizePolicy) + self.nameComboBox.setEditable(True) + self.nameComboBox.setObjectName("nameComboBox") + self.gridLayout.addWidget(self.nameComboBox, 0, 1, 1, 1) + self.keepCheckBox = QtWidgets.QCheckBox(parent=HgUnshelveDataDialog) + self.keepCheckBox.setObjectName("keepCheckBox") + self.gridLayout.addWidget(self.keepCheckBox, 1, 0, 1, 2) + self.buttonBox = QtWidgets.QDialogButtonBox(parent=HgUnshelveDataDialog) + self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal) + self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok) + self.buttonBox.setObjectName("buttonBox") + self.gridLayout.addWidget(self.buttonBox, 2, 0, 1, 2) + + self.retranslateUi(HgUnshelveDataDialog) + self.buttonBox.accepted.connect(HgUnshelveDataDialog.accept) # type: ignore + self.buttonBox.rejected.connect(HgUnshelveDataDialog.reject) # type: ignore + QtCore.QMetaObject.connectSlotsByName(HgUnshelveDataDialog) + HgUnshelveDataDialog.setTabOrder(self.nameComboBox, self.keepCheckBox) + HgUnshelveDataDialog.setTabOrder(self.keepCheckBox, self.buttonBox) + + def retranslateUi(self, HgUnshelveDataDialog): + _translate = QtCore.QCoreApplication.translate + HgUnshelveDataDialog.setWindowTitle(_translate("HgUnshelveDataDialog", "Mercurial Unshelve")) + self.label.setText(_translate("HgUnshelveDataDialog", "Name:")) + self.nameComboBox.setToolTip(_translate("HgUnshelveDataDialog", "Enter the name of the shelve")) + self.keepCheckBox.setToolTip(_translate("HgUnshelveDataDialog", "Select to keep the shelved change")) + self.keepCheckBox.setText(_translate("HgUnshelveDataDialog", "Keep shelved change"))
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,8 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Package implementing the shelve extension support interface. +"""
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,252 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing the shelve extension interface. +""" + +from PyQt6.QtWidgets import QDialog + +from eric7.EricWidgets import EricMessageBox +from eric7.UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog + +from ..HgDialog import HgDialog +from ..HgExtension import HgExtension + + +class Shelve(HgExtension): + """ + Class implementing the shelve extension interface. + """ + + def __init__(self, vcs, ui=None): + """ + Constructor + + @param vcs reference to the Mercurial vcs object + @type Hg + @param ui reference to a UI widget (defaults to None) + @type QWidget + """ + super().__init__(vcs, ui=ui) + + self.__unshelveKeep = False + + self.__shelveBrowserDialog = None + + def shutdown(self): + """ + Public method used to shutdown the shelve interface. + """ + if self.__shelveBrowserDialog is not None: + self.__shelveBrowserDialog.close() + + def __hgGetShelveNamesList(self): + """ + Private method to get the list of shelved changes. + + @return list of shelved changes + @rtype list of str + """ + args = self.vcs.initCommand("shelve") + args.append("--list") + args.append("--quiet") + + client = self.vcs.getClient() + output = client.runcommand(args)[0] + + shelveNamesList = [] + for line in output.splitlines(): + shelveNamesList.append(line.strip()) + + return shelveNamesList[:] + + def hgShelve(self, name): + """ + Public method to shelve current changes of files or directories. + + @param name directory or file name (string) or list of directory + or file names + @type list of str + @return flag indicating that the project should be reread + @rtype bool + """ + from .HgShelveDataDialog import HgShelveDataDialog + + res = False + dlg = HgShelveDataDialog(self.vcs.version, parent=self.ui) + if dlg.exec() == QDialog.DialogCode.Accepted: + shelveName, dateTime, message, addRemove, keep = dlg.getData() + + args = self.vcs.initCommand("shelve") + if shelveName: + args.append("--name") + args.append(shelveName) + if message: + args.append("--message") + args.append(message) + if addRemove: + args.append("--addremove") + if dateTime.isValid(): + args.append("--date") + args.append(dateTime.toString("yyyy-MM-dd hh:mm:ss")) + if self.vcs.version >= (5, 0, 0) and keep: + args.append("--keep") + args.append("-v") + + if isinstance(name, list): + self.vcs.addArguments(args, name) + else: + args.append(name) + + dia = HgDialog( + self.tr("Shelve current changes"), hg=self.vcs, parent=self.ui + ) + res = dia.startProcess(args) + if res: + dia.exec() + res = dia.hasAddOrDelete() + self.vcs.checkVCSStatus() + return res + + def hgShelveBrowser(self): + """ + Public method to show the shelve browser dialog. + """ + from .HgShelveBrowserDialog import HgShelveBrowserDialog + + if self.__shelveBrowserDialog is None: + self.__shelveBrowserDialog = HgShelveBrowserDialog(self.vcs) + self.__shelveBrowserDialog.show() + self.__shelveBrowserDialog.start() + + def hgUnshelve(self, shelveName=""): + """ + Public method to restore shelved changes to the project directory. + + @param shelveName name of the shelve to restore + @type str + @return flag indicating that the project should be reread + @rtype bool + """ + from .HgUnshelveDataDialog import HgUnshelveDataDialog + + res = False + dlg = HgUnshelveDataDialog( + self.__hgGetShelveNamesList(), shelveName=shelveName, parent=self.ui + ) + if dlg.exec() == QDialog.DialogCode.Accepted: + shelveName, keep = dlg.getData() + self.__unshelveKeep = keep # store for potential continue + + args = self.vcs.initCommand("unshelve") + if keep: + args.append("--keep") + if shelveName: + args.append(shelveName) + + dia = HgDialog( + self.tr("Restore shelved changes"), hg=self.vcs, parent=self.ui + ) + res = dia.startProcess(args) + if res: + dia.exec() + res = dia.hasAddOrDelete() + self.vcs.checkVCSStatus() + return res + + def hgUnshelveAbort(self): + """ + Public method to abort the ongoing restore operation. + + @return flag indicating that the project should be reread + @rtype bool + """ + args = self.vcs.initCommand("unshelve") + args.append("--abort") + + dia = HgDialog(self.tr("Abort restore operation"), hg=self.vcs, parent=self.ui) + res = dia.startProcess(args) + if res: + dia.exec() + res = dia.hasAddOrDelete() + self.vcs.checkVCSStatus() + return res + + def hgUnshelveContinue(self): + """ + Public method to continue the ongoing restore operation. + + @return flag indicating that the project should be reread + @rtype bool + """ + args = self.vcs.initCommand("unshelve") + if self.__unshelveKeep: + args.append("--keep") + args.append("--continue") + + dia = HgDialog( + self.tr("Continue restore operation"), hg=self.vcs, parent=self.ui + ) + res = dia.startProcess(args) + if res: + dia.exec() + res = dia.hasAddOrDelete() + self.vcs.checkVCSStatus() + return res + + def hgDeleteShelves(self, shelveNames=None): + """ + Public method to delete named shelves. + + @param shelveNames name of shelves to delete + @type list of str + """ + from .HgShelvesSelectionDialog import HgShelvesSelectionDialog + + if not shelveNames: + dlg = HgShelvesSelectionDialog( + self.tr("Select the shelves to be deleted:"), + self.__hgGetShelveNamesList(), + parent=self.ui, + ) + if dlg.exec() == QDialog.DialogCode.Accepted: + shelveNames = dlg.getSelectedShelves() + else: + return + + dlg = DeleteFilesConfirmationDialog( + self.ui, + self.tr("Delete shelves"), + self.tr("Do you really want to delete these shelves?"), + shelveNames, + ) + if dlg.exec() == QDialog.DialogCode.Accepted: + args = self.vcs.initCommand("shelve") + args.append("--delete") + args.extend(shelveNames) + + dia = HgDialog(self.tr("Delete shelves"), hg=self.vcs, parent=self.ui) + res = dia.startProcess(args) + if res: + dia.exec() + + def hgCleanupShelves(self): + """ + Public method to delete all shelves. + """ + res = EricMessageBox.yesNo( + None, + self.tr("Delete all shelves"), + self.tr("""Do you really want to delete all shelved changes?"""), + ) + if res: + args = self.vcs.initCommand("shelve") + args.append("--cleanup") + + dia = HgDialog(self.tr("Delete all shelves"), hg=self.vcs, parent=self.ui) + res = dia.startProcess(args) + if res: + dia.exec()
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,357 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> -# - -""" -Module implementing Mercurial shelve browser dialog. -""" - -from PyQt6.QtCore import QPoint, Qt, pyqtSlot -from PyQt6.QtWidgets import ( - QAbstractButton, - QApplication, - QDialogButtonBox, - QHeaderView, - QMenu, - QTreeWidgetItem, - QWidget, -) - -from eric7.EricGui.EricOverrideCursor import EricOverrideCursor - -from .Ui_HgShelveBrowserDialog import Ui_HgShelveBrowserDialog - - -class HgShelveBrowserDialog(QWidget, Ui_HgShelveBrowserDialog): - """ - Class implementing Mercurial shelve browser dialog. - """ - - NameColumn = 0 - AgeColumn = 1 - MessageColumn = 2 - - def __init__(self, vcs, parent=None): - """ - Constructor - - @param vcs reference to the vcs object - @type Hg - @param parent parent widget - @type QWidget - """ - super().__init__(parent) - self.setupUi(self) - - self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setEnabled(False) - self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setDefault(True) - - self.__position = QPoint() - - self.__fileStatisticsRole = Qt.ItemDataRole.UserRole - self.__totalStatisticsRole = Qt.ItemDataRole.UserRole + 1 - - self.shelveList.header().setSortIndicator(0, Qt.SortOrder.AscendingOrder) - - self.refreshButton = self.buttonBox.addButton( - self.tr("&Refresh"), QDialogButtonBox.ButtonRole.ActionRole - ) - self.refreshButton.setToolTip(self.tr("Press to refresh the list of shelves")) - self.refreshButton.setEnabled(False) - - self.vcs = vcs - self.__hgClient = vcs.getClient() - self.__resetUI() - - self.__contextMenu = QMenu() - self.__unshelveAct = self.__contextMenu.addAction( - self.tr("Restore selected shelve"), self.__unshelve - ) - self.__deleteAct = self.__contextMenu.addAction( - self.tr("Delete selected shelves"), self.__deleteShelves - ) - self.__contextMenu.addAction( - self.tr("Delete all shelves"), self.__cleanupShelves - ) - - def closeEvent(self, e): - """ - Protected slot implementing a close event handler. - - @param e close event - @type QCloseEvent - """ - if self.__hgClient.isExecuting(): - self.__hgClient.cancel() - - self.__position = self.pos() - - e.accept() - - def show(self): - """ - Public slot to show the dialog. - """ - if not self.__position.isNull(): - self.move(self.__position) - self.__resetUI() - - super().show() - - def __resetUI(self): - """ - Private method to reset the user interface. - """ - self.shelveList.clear() - - def __resizeColumnsShelves(self): - """ - Private method to resize the shelve list columns. - """ - self.shelveList.header().resizeSections(QHeaderView.ResizeMode.ResizeToContents) - self.shelveList.header().setStretchLastSection(True) - - def __generateShelveEntry(self, name, age, message, fileStatistics, totals): - """ - Private method to generate the shelve items. - - @param name name of the shelve - @type str - @param age age of the shelve - @type str - @param message shelve message - @type str - @param fileStatistics per file change statistics (tuple containing the - file name, the number of changes, the number of added lines and the - number of deleted lines) - @type tuple of (str, str, str, str) - @param totals overall statistics (tuple containing the number of changed files, - the number of added lines and the number of deleted lines) - @type tuple of (str, str, str) - """ - itm = QTreeWidgetItem(self.shelveList, [name, age, message]) - itm.setData(0, self.__fileStatisticsRole, fileStatistics) - itm.setData(0, self.__totalStatisticsRole, totals) - - def __getShelveEntries(self): - """ - Private method to retrieve the list of shelves. - """ - self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setEnabled(False) - self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setEnabled(True) - self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setDefault(True) - QApplication.processEvents() - - self.buf = [] - self.errors.clear() - self.intercept = False - - args = self.vcs.initCommand("shelve") - args.append("--list") - args.append("--stat") - - with EricOverrideCursor(): - out, err = self.__hgClient.runcommand(args) - self.buf = out.splitlines(True) - if err: - self.__showError(err) - self.__processBuffer() - self.__finish() - - def start(self): - """ - Public slot to start the hg shelve command. - """ - self.errorGroup.hide() - QApplication.processEvents() - - self.activateWindow() - self.raise_() - - self.shelveList.clear() - self.__started = True - self.__getShelveEntries() - - def __finish(self): - """ - Private slot called when the process finished or the user pressed - the button. - """ - self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setEnabled(True) - self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setEnabled(False) - self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setDefault(True) - - self.refreshButton.setEnabled(True) - - def __processBuffer(self): - """ - Private method to process the buffered output of the hg shelve command. - """ - lastWasFileStats = False - firstLine = True - itemData = {} - for line in self.buf: - if firstLine: - name, line = line.split("(", 1) - age, message = line.split(")", 1) - itemData["name"] = name.strip() - itemData["age"] = age.strip() - itemData["message"] = message.strip() - itemData["files"] = [] - firstLine = False - elif "|" in line: - # file stats: foo.py | 3 ++- - file, changes = line.strip().split("|", 1) - if changes.strip().endswith(("+", "-")): - total, addDelete = changes.strip().split(None, 1) - additions = str(addDelete.count("+")) - deletions = str(addDelete.count("-")) - else: - total = changes.strip() - additions = "0" - deletions = "0" - itemData["files"].append((file, total, additions, deletions)) - lastWasFileStats = True - elif lastWasFileStats: - # summary line - # 2 files changed, 15 insertions(+), 1 deletions(-) - total, added, deleted = line.strip().split(",", 2) - total = total.split()[0] - added = added.split()[0] - deleted = deleted.split()[0] - itemData["summary"] = (total, added, deleted) - - self.__generateShelveEntry( - itemData["name"], - itemData["age"], - itemData["message"], - itemData["files"], - itemData["summary"], - ) - - lastWasFileStats = False - firstLine = True - itemData = {} - - self.__resizeColumnsShelves() - - if self.__started: - self.shelveList.setCurrentItem(self.shelveList.topLevelItem(0)) - self.__started = False - - def __showError(self, out): - """ - Private slot to show some error. - - @param out error to be shown - @type str - """ - self.errorGroup.show() - self.errors.insertPlainText(out) - self.errors.ensureCursorVisible() - - @pyqtSlot(QAbstractButton) - def on_buttonBox_clicked(self, button): - """ - Private slot called by a button of the button box clicked. - - @param button button that was clicked - @type QAbstractButton - """ - if button == self.buttonBox.button(QDialogButtonBox.StandardButton.Close): - self.close() - elif button == self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel): - self.cancelled = True - self.__hgClient.cancel() - elif button == self.refreshButton: - self.on_refreshButton_clicked() - - @pyqtSlot(QTreeWidgetItem, QTreeWidgetItem) - def on_shelveList_currentItemChanged(self, current, _previous): - """ - Private slot called, when the current item of the shelve list changes. - - @param current reference to the new current item - @type QTreeWidgetItem - @param _previous reference to the old current item (unused) - @type QTreeWidgetItem - """ - self.statisticsList.clear() - if current: - for dataSet in current.data(0, self.__fileStatisticsRole): - QTreeWidgetItem(self.statisticsList, list(dataSet)) - self.statisticsList.header().resizeSections( - QHeaderView.ResizeMode.ResizeToContents - ) - self.statisticsList.header().setStretchLastSection(True) - - totals = current.data(0, self.__totalStatisticsRole) - self.filesLabel.setText(self.tr("%n file(s) changed", None, int(totals[0]))) - self.insertionsLabel.setText( - self.tr("%n line(s) inserted", None, int(totals[1])) - ) - self.deletionsLabel.setText( - self.tr("%n line(s) deleted", None, int(totals[2])) - ) - else: - self.filesLabel.setText("") - self.insertionsLabel.setText("") - self.deletionsLabel.setText("") - - @pyqtSlot(QPoint) - def on_shelveList_customContextMenuRequested(self, pos): - """ - Private slot to show the context menu of the shelve list. - - @param pos position of the mouse pointer - @type QPoint - """ - selectedItemsCount = len(self.shelveList.selectedItems()) - self.__unshelveAct.setEnabled(selectedItemsCount == 1) - self.__deleteAct.setEnabled(selectedItemsCount > 0) - - self.__contextMenu.popup(self.mapToGlobal(pos)) - - @pyqtSlot() - def on_refreshButton_clicked(self): - """ - Private slot to refresh the list of shelves. - """ - self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setEnabled(False) - self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setEnabled(True) - self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setDefault(True) - - self.refreshButton.setEnabled(False) - - self.start() - - def __unshelve(self): - """ - Private slot to restore the selected shelve of changes. - """ - itm = self.shelveList.selectedItems()[0] - if itm is not None: - name = itm.text(self.NameColumn) - self.vcs.getExtensionObject("shelve").hgUnshelve(shelveName=name) - self.on_refreshButton_clicked() - - def __deleteShelves(self): - """ - Private slot to delete the selected shelves. - """ - shelveNames = [] - for itm in self.shelveList.selectedItems(): - shelveNames.append(itm.text(self.NameColumn)) - if shelveNames: - self.vcs.getExtensionObject("shelve").hgDeleteShelves( - shelveNames=shelveNames - ) - self.on_refreshButton_clicked() - - def __cleanupShelves(self): - """ - Private slot to delete all shelves. - """ - self.vcs.getExtensionObject("shelve").hgCleanupShelves() - self.on_refreshButton_clicked()
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui Sat Nov 30 11:09:02 2024 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,192 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ui version="4.0"> - <class>HgShelveBrowserDialog</class> - <widget class="QWidget" name="HgShelveBrowserDialog"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>650</width> - <height>574</height> - </rect> - </property> - <property name="windowTitle"> - <string>Mercurial Shelve Browser</string> - </property> - <layout class="QVBoxLayout" name="verticalLayout_2"> - <item> - <widget class="QTreeWidget" name="shelveList"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> - <horstretch>0</horstretch> - <verstretch>5</verstretch> - </sizepolicy> - </property> - <property name="contextMenuPolicy"> - <enum>Qt::CustomContextMenu</enum> - </property> - <property name="alternatingRowColors"> - <bool>true</bool> - </property> - <property name="selectionMode"> - <enum>QAbstractItemView::ExtendedSelection</enum> - </property> - <property name="rootIsDecorated"> - <bool>false</bool> - </property> - <property name="itemsExpandable"> - <bool>false</bool> - </property> - <property name="sortingEnabled"> - <bool>true</bool> - </property> - <column> - <property name="text"> - <string>Name</string> - </property> - </column> - <column> - <property name="text"> - <string>Age</string> - </property> - </column> - <column> - <property name="text"> - <string>Message</string> - </property> - </column> - </widget> - </item> - <item> - <widget class="QGroupBox" name="groupBox"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>4</verstretch> - </sizepolicy> - </property> - <property name="title"> - <string>Statistics</string> - </property> - <layout class="QVBoxLayout" name="verticalLayout"> - <item> - <widget class="QTreeWidget" name="statisticsList"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> - <horstretch>0</horstretch> - <verstretch>2</verstretch> - </sizepolicy> - </property> - <property name="alternatingRowColors"> - <bool>true</bool> - </property> - <property name="selectionMode"> - <enum>QAbstractItemView::NoSelection</enum> - </property> - <property name="rootIsDecorated"> - <bool>false</bool> - </property> - <property name="itemsExpandable"> - <bool>false</bool> - </property> - <column> - <property name="text"> - <string>File</string> - </property> - </column> - <column> - <property name="text"> - <string>Changes</string> - </property> - </column> - <column> - <property name="text"> - <string>Lines added</string> - </property> - </column> - <column> - <property name="text"> - <string>Lines deleted</string> - </property> - </column> - <column> - <property name="text"> - <string/> - </property> - </column> - </widget> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout"> - <item> - <widget class="QLabel" name="filesLabel"> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="insertionsLabel"> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="deletionsLabel"> - <property name="text"> - <string/> - </property> - </widget> - </item> - </layout> - </item> - </layout> - </widget> - </item> - <item> - <widget class="QGroupBox" name="errorGroup"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> - <horstretch>0</horstretch> - <verstretch>1</verstretch> - </sizepolicy> - </property> - <property name="title"> - <string>Errors</string> - </property> - <layout class="QVBoxLayout"> - <item> - <widget class="QTextEdit" name="errors"> - <property name="whatsThis"> - <string><b>Mercurial shelve errors</b><p>This shows possible error messages of the hg shelve command.</p></string> - </property> - <property name="readOnly"> - <bool>true</bool> - </property> - <property name="acceptRichText"> - <bool>false</bool> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> - <widget class="QDialogButtonBox" name="buttonBox"> - <property name="standardButtons"> - <set>QDialogButtonBox::Cancel|QDialogButtonBox::Close</set> - </property> - </widget> - </item> - </layout> - </widget> - <tabstops> - <tabstop>shelveList</tabstop> - <tabstop>statisticsList</tabstop> - <tabstop>errors</tabstop> - <tabstop>buttonBox</tabstop> - </tabstops> - <resources/> - <connections/> -</ui>
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,63 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> -# - -""" -Module implementing a dialog to enter the data for a shelve operation. -""" - -from PyQt6.QtCore import QDateTime -from PyQt6.QtWidgets import QDialog - -from .Ui_HgShelveDataDialog import Ui_HgShelveDataDialog - - -class HgShelveDataDialog(QDialog, Ui_HgShelveDataDialog): - """ - Class implementing a dialog to enter the data for a shelve operation. - """ - - def __init__(self, version, parent=None): - """ - Constructor - - @param version Mercurial version - @type tuple of three int - @param parent reference to the parent widget - @type QWidget - """ - super().__init__(parent) - self.setupUi(self) - - self.__initialDateTime = QDateTime.currentDateTime() - self.dateTimeEdit.setDateTime(self.__initialDateTime) - - if version < (5, 0, 0): - self.keepCheckBox.setChecked(False) - self.keepCheckBox.hide() - - msh = self.minimumSizeHint() - self.resize(max(self.width(), msh.width()), msh.height()) - - def getData(self): - """ - Public method to get the user data. - - @return tuple containing the name, date, message, a flag indicating - to add/remove new/missing files and a flag indicating to keep the - shelved changes in the working directory - @rtype tuple of (str, QDateTime, str, bool, bool) - """ - dateTime = ( - self.dateTimeEdit.dateTime() - if self.dateTimeEdit.dateTime() != self.__initialDateTime - else QDateTime() - ) - return ( - self.nameEdit.text().replace(" ", "_"), - dateTime, - self.messageEdit.text(), - self.addRemoveCheckBox.isChecked(), - self.keepCheckBox.isChecked(), - )
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui Sat Nov 30 11:09:02 2024 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,159 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ui version="4.0"> - <class>HgShelveDataDialog</class> - <widget class="QDialog" name="HgShelveDataDialog"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>500</width> - <height>167</height> - </rect> - </property> - <property name="windowTitle"> - <string>Shelve</string> - </property> - <property name="sizeGripEnabled"> - <bool>true</bool> - </property> - <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> - <widget class="QLabel" name="label"> - <property name="text"> - <string>Name:</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QLineEdit" name="nameEdit"> - <property name="toolTip"> - <string>Enter a name for the shelve</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_2"> - <property name="text"> - <string>Date, Time:</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <layout class="QHBoxLayout" name="horizontalLayout"> - <item> - <widget class="QDateTimeEdit" name="dateTimeEdit"> - <property name="statusTip"> - <string>Enter the commit date and time for the shelve</string> - </property> - <property name="displayFormat"> - <string>yyyy-MM-dd HH:mm</string> - </property> - <property name="calendarPopup"> - <bool>true</bool> - </property> - </widget> - </item> - <item> - <spacer name="horizontalSpacer"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>198</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - </layout> - </item> - <item row="2" column="0"> - <widget class="QLabel" name="label_3"> - <property name="text"> - <string>Message:</string> - </property> - <property name="alignment"> - <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> - </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="QLineEdit" name="messageEdit"> - <property name="toolTip"> - <string>Enter a message for the shelve</string> - </property> - </widget> - </item> - <item row="3" column="0" colspan="2"> - <widget class="QCheckBox" name="addRemoveCheckBox"> - <property name="text"> - <string>Mark new/missing files as added/removed</string> - </property> - </widget> - </item> - <item row="4" column="0" colspan="2"> - <widget class="QCheckBox" name="keepCheckBox"> - <property name="toolTip"> - <string>Select to shelve, but keep the changes in the working directory</string> - </property> - <property name="text"> - <string>Shelve, but keep changes</string> - </property> - </widget> - </item> - <item row="5" column="0" colspan="2"> - <widget class="QDialogButtonBox" name="buttonBox"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="standardButtons"> - <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> - </property> - </widget> - </item> - </layout> - </widget> - <tabstops> - <tabstop>nameEdit</tabstop> - <tabstop>dateTimeEdit</tabstop> - <tabstop>messageEdit</tabstop> - <tabstop>addRemoveCheckBox</tabstop> - <tabstop>buttonBox</tabstop> - </tabstops> - <resources/> - <connections> - <connection> - <sender>buttonBox</sender> - <signal>accepted()</signal> - <receiver>HgShelveDataDialog</receiver> - <slot>accept()</slot> - <hints> - <hint type="sourcelabel"> - <x>248</x> - <y>254</y> - </hint> - <hint type="destinationlabel"> - <x>157</x> - <y>274</y> - </hint> - </hints> - </connection> - <connection> - <sender>buttonBox</sender> - <signal>rejected()</signal> - <receiver>HgShelveDataDialog</receiver> - <slot>reject()</slot> - <hints> - <hint type="sourcelabel"> - <x>316</x> - <y>260</y> - </hint> - <hint type="destinationlabel"> - <x>286</x> - <y>274</y> - </hint> - </hints> - </connection> - </connections> -</ui>
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelvesSelectionDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,60 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> -# - -""" -Module implementing a dialog to select multiple shelve names. -""" - -from PyQt6.QtCore import pyqtSlot -from PyQt6.QtWidgets import QDialog, QDialogButtonBox - -from .Ui_HgShelvesSelectionDialog import Ui_HgShelvesSelectionDialog - - -class HgShelvesSelectionDialog(QDialog, Ui_HgShelvesSelectionDialog): - """ - Class implementing a dialog to select multiple shelve names. - """ - - def __init__(self, message, shelveNames, parent=None): - """ - Constructor - - @param message message to be shown - @type str - @param shelveNames list of shelve names - @type list of str - @param parent reference to the parent widget - @type QWidget - """ - super().__init__(parent) - self.setupUi(self) - - self.message.setText(message) - self.shelvesList.addItems(shelveNames) - - self.buttonBox.button(QDialogButtonBox.StandardButton.Ok).setEnabled(False) - - @pyqtSlot() - def on_shelvesList_itemSelectionChanged(self): - """ - Private slot to enabled the OK button if items have been selected. - """ - self.buttonBox.button(QDialogButtonBox.StandardButton.Ok).setEnabled( - len(self.shelvesList.selectedItems()) > 0 - ) - - def getSelectedShelves(self): - """ - Public method to retrieve the selected shelve names. - - @return selected shelve names - @rtype list of str - """ - names = [] - for itm in self.shelvesList.selectedItems(): - names.append(itm.text()) - - return names
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelvesSelectionDialog.ui Sat Nov 30 11:09:02 2024 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,91 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ui version="4.0"> - <class>HgShelvesSelectionDialog</class> - <widget class="QDialog" name="HgShelvesSelectionDialog"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>400</width> - <height>300</height> - </rect> - </property> - <property name="windowTitle"> - <string>Mercurial Shelve Selection</string> - </property> - <property name="sizeGripEnabled"> - <bool>true</bool> - </property> - <layout class="QVBoxLayout" name="verticalLayout"> - <item> - <widget class="QLabel" name="message"> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item> - <widget class="QListWidget" name="shelvesList"> - <property name="alternatingRowColors"> - <bool>true</bool> - </property> - <property name="selectionMode"> - <enum>QAbstractItemView::ExtendedSelection</enum> - </property> - <property name="sortingEnabled"> - <bool>true</bool> - </property> - </widget> - </item> - <item> - <widget class="QDialogButtonBox" name="buttonBox"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="standardButtons"> - <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> - </property> - </widget> - </item> - </layout> - </widget> - <tabstops> - <tabstop>shelvesList</tabstop> - <tabstop>buttonBox</tabstop> - </tabstops> - <resources/> - <connections> - <connection> - <sender>buttonBox</sender> - <signal>accepted()</signal> - <receiver>HgShelvesSelectionDialog</receiver> - <slot>accept()</slot> - <hints> - <hint type="sourcelabel"> - <x>248</x> - <y>254</y> - </hint> - <hint type="destinationlabel"> - <x>157</x> - <y>274</y> - </hint> - </hints> - </connection> - <connection> - <sender>buttonBox</sender> - <signal>rejected()</signal> - <receiver>HgShelvesSelectionDialog</receiver> - <slot>reject()</slot> - <hints> - <hint type="sourcelabel"> - <x>316</x> - <y>260</y> - </hint> - <hint type="destinationlabel"> - <x>286</x> - <y>274</y> - </hint> - </hints> - </connection> - </connections> -</ui>
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,54 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> -# - -""" -Module implementing a dialog to enter the data for an unshelve operation. -""" - -from PyQt6.QtWidgets import QDialog - -from .Ui_HgUnshelveDataDialog import Ui_HgUnshelveDataDialog - - -class HgUnshelveDataDialog(QDialog, Ui_HgUnshelveDataDialog): - """ - Class implementing a dialog to enter the data for an unshelve operation. - """ - - def __init__(self, shelveNames, shelveName="", parent=None): - """ - Constructor - - @param shelveNames list of available shelves - @type list of str - @param shelveName name of the shelve to restore - @type str - @param parent reference to the parent widget - @type QWidget - """ - super().__init__(parent) - self.setupUi(self) - - self.nameComboBox.addItem("") - self.nameComboBox.addItems(sorted(shelveNames)) - - if shelveName and shelveName in shelveNames: - self.nameComboBox.setCurrentIndex(self.nameComboBox.findText(shelveName)) - - msh = self.minimumSizeHint() - self.resize(max(self.width(), msh.width()), msh.height()) - - def getData(self): - """ - Public method to get the user data. - - @return tuple containing the name and a flag indicating to keep the - shelved change - @rtype tuple of (str, bool) - """ - return ( - self.nameComboBox.currentText().replace(" ", "_"), - self.keepCheckBox.isChecked(), - )
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui Sat Nov 30 11:09:02 2024 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,105 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ui version="4.0"> - <class>HgUnshelveDataDialog</class> - <widget class="QDialog" name="HgUnshelveDataDialog"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>400</width> - <height>108</height> - </rect> - </property> - <property name="windowTitle"> - <string>Mercurial Unshelve</string> - </property> - <property name="sizeGripEnabled"> - <bool>true</bool> - </property> - <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> - <widget class="QLabel" name="label"> - <property name="text"> - <string>Name:</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QComboBox" name="nameComboBox"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="toolTip"> - <string>Enter the name of the shelve</string> - </property> - <property name="editable"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="1" column="0" colspan="2"> - <widget class="QCheckBox" name="keepCheckBox"> - <property name="toolTip"> - <string>Select to keep the shelved change</string> - </property> - <property name="text"> - <string>Keep shelved change</string> - </property> - </widget> - </item> - <item row="2" column="0" colspan="2"> - <widget class="QDialogButtonBox" name="buttonBox"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="standardButtons"> - <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> - </property> - </widget> - </item> - </layout> - </widget> - <tabstops> - <tabstop>nameComboBox</tabstop> - <tabstop>keepCheckBox</tabstop> - <tabstop>buttonBox</tabstop> - </tabstops> - <resources/> - <connections> - <connection> - <sender>buttonBox</sender> - <signal>accepted()</signal> - <receiver>HgUnshelveDataDialog</receiver> - <slot>accept()</slot> - <hints> - <hint type="sourcelabel"> - <x>248</x> - <y>254</y> - </hint> - <hint type="destinationlabel"> - <x>157</x> - <y>274</y> - </hint> - </hints> - </connection> - <connection> - <sender>buttonBox</sender> - <signal>rejected()</signal> - <receiver>HgUnshelveDataDialog</receiver> - <slot>reject()</slot> - <hints> - <hint type="sourcelabel"> - <x>316</x> - <y>260</y> - </hint> - <hint type="destinationlabel"> - <x>286</x> - <y>274</y> - </hint> - </hints> - </connection> - </connections> -</ui>
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py Sat Nov 30 11:09:02 2024 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,122 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> -# - -""" -Module implementing the shelve extension project browser helper. -""" - -from PyQt6.QtWidgets import QMenu - -from eric7.EricWidgets import EricMessageBox - -from ..HgExtensionProjectBrowserHelper import HgExtensionProjectBrowserHelper - - -class ShelveProjectBrowserHelper(HgExtensionProjectBrowserHelper): - """ - Class implementing the shelve extension project browser helper. - """ - - def __init__(self, vcsObject, browserObject, projectObject): - """ - Constructor - - @param vcsObject reference to the vcs object - @type Hg - @param browserObject reference to the project browser object - @type ProjectBaseBrowser - @param projectObject reference to the project object - @type Project - """ - super().__init__(vcsObject, browserObject, projectObject) - - def initMenus(self): - """ - Public method to generate the extension menus. - - @return dictionary of populated menu. The dict must have the keys 'mainMenu', - 'multiMenu', 'backMenu', 'dirMenu' and 'dirMultiMenu'. - @rtype dict of QMenu - """ - self.__menus = {} - - menu = QMenu(self.menuTitle()) - menu.setTearOffEnabled(True) - menu.addAction(self.tr("Shelve changes"), self.__hgShelve) - self.__menus["mainMenu"] = menu - - menu = QMenu(self.menuTitle()) - menu.setTearOffEnabled(True) - menu.addAction(self.tr("Shelve changes"), self.__hgShelve) - self.__menus["multiMenu"] = menu - - menu = QMenu(self.menuTitle()) - menu.setTearOffEnabled(True) - menu.addAction(self.tr("Shelve changes"), self.__hgShelve) - self.__menus["dirMenu"] = menu - - menu = QMenu(self.menuTitle()) - menu.setTearOffEnabled(True) - menu.addAction(self.tr("Shelve changes"), self.__hgShelve) - self.__menus["dirMultiMenu"] = menu - - return self.__menus - - def menuTitle(self): - """ - Public method to get the menu title. - - @return title of the menu - @rtype str - """ - return self.tr("Shelve") - - def showExtensionMenu(self, key, controlled): - """ - Public method to prepare the extension menu for display. - - @param key menu key (one of 'mainMenu', 'multiMenu', 'backMenu', 'dirMenu' - or 'dirMultiMenu') - @type str - @param controlled flag indicating to prepare the menu for a - version controlled entry or a non-version controlled entry - @type bool - """ - if key in self.__menus: - self.__menus[key].setEnabled(controlled) - - def __reopenProject(self, shouldReopen, title): - """ - Private method to reopen the project if needed and wanted. - - @param shouldReopen flag indicating that the project should - be reopened - @type bool - @param title title of the message box - @type str - """ - if shouldReopen: - res = EricMessageBox.yesNo( - None, - title, - self.tr("""The project should be reread. Do this now?"""), - yesDefault=True, - ) - if res: - self.project.reopenProject() - - def __hgShelve(self): - """ - Private slot used to shelve all current changes. - """ - names = [] - for itm in self.browser.getSelectedItems(): - try: - name = itm.fileName() - except AttributeError: - name = itm.dirName() - names.append(name) - shouldReopen = self.vcs.getExtensionObject("shelve").hgShelve(names) - self.__reopenProject(shouldReopen, self.tr("Shelve"))
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py Sat Nov 30 11:09:02 2024 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,270 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> -# - -""" -Module implementing the shelve extension project helper. -""" - -from PyQt6.QtWidgets import QMenu - -from eric7.EricGui.EricAction import EricAction -from eric7.EricWidgets import EricMessageBox - -from ..HgExtensionProjectHelper import HgExtensionProjectHelper - - -class ShelveProjectHelper(HgExtensionProjectHelper): - """ - Class implementing the shelve extension project helper. - """ - - def __init__(self): - """ - Constructor - """ - super().__init__() - - def initActions(self): - """ - Public method to generate the action objects. - """ - self.hgShelveAct = EricAction( - self.tr("Shelve changes"), - self.tr("Shelve changes..."), - 0, - 0, - self, - "mercurial_shelve", - ) - self.hgShelveAct.setStatusTip( - self.tr("Shelve all current changes of the project") - ) - self.hgShelveAct.setWhatsThis( - self.tr( - """<b>Shelve changes</b>""" - """<p>This shelves all current changes of the project.</p>""" - ) - ) - self.hgShelveAct.triggered.connect(self.__hgShelve) - self.actions.append(self.hgShelveAct) - - self.hgShelveBrowserAct = EricAction( - self.tr("Show shelve browser"), - self.tr("Show shelve browser..."), - 0, - 0, - self, - "mercurial_shelve_browser", - ) - self.hgShelveBrowserAct.setStatusTip(self.tr("Show a dialog with all shelves")) - self.hgShelveBrowserAct.setWhatsThis( - self.tr( - """<b>Show shelve browser...</b>""" - """<p>This shows a dialog listing all available shelves.""" - """ Actions on these shelves may be executed via the""" - """ context menu.</p>""" - ) - ) - self.hgShelveBrowserAct.triggered.connect(self.__hgShelveBrowser) - self.actions.append(self.hgShelveBrowserAct) - - self.hgUnshelveAct = EricAction( - self.tr("Restore shelved change"), - self.tr("Restore shelved change..."), - 0, - 0, - self, - "mercurial_unshelve", - ) - self.hgUnshelveAct.setStatusTip( - self.tr("Restore a shelved change to the project directory") - ) - self.hgUnshelveAct.setWhatsThis( - self.tr( - """<b>Restore shelved change</b>""" - """<p>This restore a shelved change to the project directory.""" - """</p>""" - ) - ) - self.hgUnshelveAct.triggered.connect(self.__hgUnshelve) - self.actions.append(self.hgUnshelveAct) - - self.hgUnshelveAbortAct = EricAction( - self.tr("Abort restore"), - self.tr("Abort restore..."), - 0, - 0, - self, - "mercurial_unshelve_abort", - ) - self.hgUnshelveAbortAct.setStatusTip( - self.tr("Abort the restore operation in progress") - ) - self.hgUnshelveAbortAct.setWhatsThis( - self.tr( - """<b>Abort restore</b>""" - """<p>This aborts the restore operation in progress and reverts""" - """ already applied changes.</p>""" - ) - ) - self.hgUnshelveAbortAct.triggered.connect(self.__hgUnshelveAbort) - self.actions.append(self.hgUnshelveAbortAct) - - self.hgUnshelveContinueAct = EricAction( - self.tr("Continue restore"), - self.tr("Continue restore..."), - 0, - 0, - self, - "mercurial_unshelve_continue", - ) - self.hgUnshelveContinueAct.setStatusTip( - self.tr("Continue the restore operation in progress") - ) - self.hgUnshelveContinueAct.setWhatsThis( - self.tr( - """<b>Continue restore</b>""" - """<p>This continues the restore operation in progress.</p>""" - ) - ) - self.hgUnshelveContinueAct.triggered.connect(self.__hgUnshelveContinue) - self.actions.append(self.hgUnshelveContinueAct) - - self.hgShelveDeleteAct = EricAction( - self.tr("Delete shelved changes"), - self.tr("Delete shelved changes..."), - 0, - 0, - self, - "mercurial_shelve_delete", - ) - self.hgShelveDeleteAct.setWhatsThis( - self.tr( - """<b>Delete shelved changes...</b>""" - """<p>This opens a dialog to select the shelved changes to""" - """ delete and deletes the selected ones.</p>""" - ) - ) - self.hgShelveDeleteAct.triggered.connect(self.__hgDeleteShelves) - self.actions.append(self.hgShelveDeleteAct) - - self.hgShelveCleanupAct = EricAction( - self.tr("Delete ALL shelved changes"), - self.tr("Delete ALL shelved changes"), - 0, - 0, - self, - "mercurial_shelve_cleanup", - ) - self.hgShelveCleanupAct.setWhatsThis( - self.tr( - """<b>Delete ALL shelved changes</b>""" - """<p>This deletes all shelved changes.</p>""" - ) - ) - self.hgShelveCleanupAct.triggered.connect(self.__hgCleanupShelves) - self.actions.append(self.hgShelveCleanupAct) - - def initMenu(self, mainMenu): - """ - Public method to generate the extension menu. - - @param mainMenu reference to the main menu - @type QMenu - @return populated menu - @rtype QMenu - """ - menu = QMenu(self.menuTitle(), mainMenu) - menu.setTearOffEnabled(True) - - menu.addAction(self.hgShelveAct) - menu.addSeparator() - menu.addAction(self.hgShelveBrowserAct) - menu.addSeparator() - menu.addAction(self.hgUnshelveAct) - menu.addAction(self.hgUnshelveContinueAct) - menu.addAction(self.hgUnshelveAbortAct) - menu.addSeparator() - menu.addAction(self.hgShelveDeleteAct) - menu.addAction(self.hgShelveCleanupAct) - - return menu - - def menuTitle(self): - """ - Public method to get the menu title. - - @return title of the menu - @rtype str - """ - return self.tr("Shelve") - - def __reopenProject(self, shouldReopen, title): - """ - Private method to reopen the project if needed and wanted. - - @param shouldReopen flag indicating that the project should - be reopened - @type bool - @param title title of the message box - @type str - """ - if shouldReopen: - res = EricMessageBox.yesNo( - None, - title, - self.tr("""The project should be reread. Do this now?"""), - yesDefault=True, - ) - if res: - self.project.reopenProject() - - def __hgShelve(self): - """ - Private slot used to shelve all current changes. - """ - shouldReopen = self.vcs.getExtensionObject("shelve").hgShelve( - self.project.getProjectPath() - ) - self.__reopenProject(shouldReopen, self.tr("Shelve")) - - def __hgShelveBrowser(self): - """ - Private slot to show the shelve browser dialog. - """ - self.vcs.getExtensionObject("shelve").hgShelveBrowser() - - def __hgUnshelve(self): - """ - Private slot used to restore a shelved change. - """ - shouldReopen = self.vcs.getExtensionObject("shelve").hgUnshelve() - self.__reopenProject(shouldReopen, self.tr("Unshelve")) - - def __hgUnshelveAbort(self): - """ - Private slot used to abort an ongoing restore operation. - """ - shouldReopen = self.vcs.getExtensionObject("shelve").hgUnshelveAbort() - self.__reopenProject(shouldReopen, self.tr("Abort Unshelve")) - - def __hgUnshelveContinue(self): - """ - Private slot used to continue an ongoing restore operation. - """ - shouldReopen = self.vcs.getExtensionObject("shelve").hgUnshelveContinue() - self.__reopenProject(shouldReopen, self.tr("Continue Unshelve")) - - def __hgDeleteShelves(self): - """ - Private slot to delete selected shelves. - """ - self.vcs.getExtensionObject("shelve").hgDeleteShelves() - - def __hgCleanupShelves(self): - """ - Private slot to delete all shelves. - """ - self.vcs.getExtensionObject("shelve").hgCleanupShelves()
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/Ui_HgShelveBrowserDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,107 +0,0 @@ -# Form implementation generated from reading ui file 'src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui' -# -# Created by: PyQt6 UI code generator 6.7.0 -# -# WARNING: Any manual changes made to this file will be lost when pyuic6 is -# run again. Do not edit this file unless you know what you are doing. - - -from PyQt6 import QtCore, QtGui, QtWidgets - - -class Ui_HgShelveBrowserDialog(object): - def setupUi(self, HgShelveBrowserDialog): - HgShelveBrowserDialog.setObjectName("HgShelveBrowserDialog") - HgShelveBrowserDialog.resize(650, 574) - self.verticalLayout_2 = QtWidgets.QVBoxLayout(HgShelveBrowserDialog) - self.verticalLayout_2.setObjectName("verticalLayout_2") - self.shelveList = QtWidgets.QTreeWidget(parent=HgShelveBrowserDialog) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Expanding) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(5) - sizePolicy.setHeightForWidth(self.shelveList.sizePolicy().hasHeightForWidth()) - self.shelveList.setSizePolicy(sizePolicy) - self.shelveList.setContextMenuPolicy(QtCore.Qt.ContextMenuPolicy.CustomContextMenu) - self.shelveList.setAlternatingRowColors(True) - self.shelveList.setSelectionMode(QtWidgets.QAbstractItemView.SelectionMode.ExtendedSelection) - self.shelveList.setRootIsDecorated(False) - self.shelveList.setItemsExpandable(False) - self.shelveList.setObjectName("shelveList") - self.verticalLayout_2.addWidget(self.shelveList) - self.groupBox = QtWidgets.QGroupBox(parent=HgShelveBrowserDialog) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(4) - sizePolicy.setHeightForWidth(self.groupBox.sizePolicy().hasHeightForWidth()) - self.groupBox.setSizePolicy(sizePolicy) - self.groupBox.setObjectName("groupBox") - self.verticalLayout = QtWidgets.QVBoxLayout(self.groupBox) - self.verticalLayout.setObjectName("verticalLayout") - self.statisticsList = QtWidgets.QTreeWidget(parent=self.groupBox) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Expanding) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(2) - sizePolicy.setHeightForWidth(self.statisticsList.sizePolicy().hasHeightForWidth()) - self.statisticsList.setSizePolicy(sizePolicy) - self.statisticsList.setAlternatingRowColors(True) - self.statisticsList.setSelectionMode(QtWidgets.QAbstractItemView.SelectionMode.NoSelection) - self.statisticsList.setRootIsDecorated(False) - self.statisticsList.setItemsExpandable(False) - self.statisticsList.setObjectName("statisticsList") - self.verticalLayout.addWidget(self.statisticsList) - self.horizontalLayout = QtWidgets.QHBoxLayout() - self.horizontalLayout.setObjectName("horizontalLayout") - self.filesLabel = QtWidgets.QLabel(parent=self.groupBox) - self.filesLabel.setText("") - self.filesLabel.setObjectName("filesLabel") - self.horizontalLayout.addWidget(self.filesLabel) - self.insertionsLabel = QtWidgets.QLabel(parent=self.groupBox) - self.insertionsLabel.setText("") - self.insertionsLabel.setObjectName("insertionsLabel") - self.horizontalLayout.addWidget(self.insertionsLabel) - self.deletionsLabel = QtWidgets.QLabel(parent=self.groupBox) - self.deletionsLabel.setText("") - self.deletionsLabel.setObjectName("deletionsLabel") - self.horizontalLayout.addWidget(self.deletionsLabel) - self.verticalLayout.addLayout(self.horizontalLayout) - self.verticalLayout_2.addWidget(self.groupBox) - self.errorGroup = QtWidgets.QGroupBox(parent=HgShelveBrowserDialog) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Expanding) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(1) - sizePolicy.setHeightForWidth(self.errorGroup.sizePolicy().hasHeightForWidth()) - self.errorGroup.setSizePolicy(sizePolicy) - self.errorGroup.setObjectName("errorGroup") - self.vboxlayout = QtWidgets.QVBoxLayout(self.errorGroup) - self.vboxlayout.setObjectName("vboxlayout") - self.errors = QtWidgets.QTextEdit(parent=self.errorGroup) - self.errors.setReadOnly(True) - self.errors.setAcceptRichText(False) - self.errors.setObjectName("errors") - self.vboxlayout.addWidget(self.errors) - self.verticalLayout_2.addWidget(self.errorGroup) - self.buttonBox = QtWidgets.QDialogButtonBox(parent=HgShelveBrowserDialog) - self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Close) - self.buttonBox.setObjectName("buttonBox") - self.verticalLayout_2.addWidget(self.buttonBox) - - self.retranslateUi(HgShelveBrowserDialog) - QtCore.QMetaObject.connectSlotsByName(HgShelveBrowserDialog) - HgShelveBrowserDialog.setTabOrder(self.shelveList, self.statisticsList) - HgShelveBrowserDialog.setTabOrder(self.statisticsList, self.errors) - HgShelveBrowserDialog.setTabOrder(self.errors, self.buttonBox) - - def retranslateUi(self, HgShelveBrowserDialog): - _translate = QtCore.QCoreApplication.translate - HgShelveBrowserDialog.setWindowTitle(_translate("HgShelveBrowserDialog", "Mercurial Shelve Browser")) - self.shelveList.setSortingEnabled(True) - self.shelveList.headerItem().setText(0, _translate("HgShelveBrowserDialog", "Name")) - self.shelveList.headerItem().setText(1, _translate("HgShelveBrowserDialog", "Age")) - self.shelveList.headerItem().setText(2, _translate("HgShelveBrowserDialog", "Message")) - self.groupBox.setTitle(_translate("HgShelveBrowserDialog", "Statistics")) - self.statisticsList.headerItem().setText(0, _translate("HgShelveBrowserDialog", "File")) - self.statisticsList.headerItem().setText(1, _translate("HgShelveBrowserDialog", "Changes")) - self.statisticsList.headerItem().setText(2, _translate("HgShelveBrowserDialog", "Lines added")) - self.statisticsList.headerItem().setText(3, _translate("HgShelveBrowserDialog", "Lines deleted")) - self.errorGroup.setTitle(_translate("HgShelveBrowserDialog", "Errors")) - self.errors.setWhatsThis(_translate("HgShelveBrowserDialog", "<b>Mercurial shelve errors</b><p>This shows possible error messages of the hg shelve command.</p>"))
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/Ui_HgShelveDataDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,77 +0,0 @@ -# Form implementation generated from reading ui file 'src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui' -# -# Created by: PyQt6 UI code generator 6.7.0 -# -# WARNING: Any manual changes made to this file will be lost when pyuic6 is -# run again. Do not edit this file unless you know what you are doing. - - -from PyQt6 import QtCore, QtGui, QtWidgets - - -class Ui_HgShelveDataDialog(object): - def setupUi(self, HgShelveDataDialog): - HgShelveDataDialog.setObjectName("HgShelveDataDialog") - HgShelveDataDialog.resize(500, 167) - HgShelveDataDialog.setSizeGripEnabled(True) - self.gridLayout = QtWidgets.QGridLayout(HgShelveDataDialog) - self.gridLayout.setObjectName("gridLayout") - self.label = QtWidgets.QLabel(parent=HgShelveDataDialog) - self.label.setObjectName("label") - self.gridLayout.addWidget(self.label, 0, 0, 1, 1) - self.nameEdit = QtWidgets.QLineEdit(parent=HgShelveDataDialog) - self.nameEdit.setObjectName("nameEdit") - self.gridLayout.addWidget(self.nameEdit, 0, 1, 1, 1) - self.label_2 = QtWidgets.QLabel(parent=HgShelveDataDialog) - self.label_2.setObjectName("label_2") - self.gridLayout.addWidget(self.label_2, 1, 0, 1, 1) - self.horizontalLayout = QtWidgets.QHBoxLayout() - self.horizontalLayout.setObjectName("horizontalLayout") - self.dateTimeEdit = QtWidgets.QDateTimeEdit(parent=HgShelveDataDialog) - self.dateTimeEdit.setCalendarPopup(True) - self.dateTimeEdit.setObjectName("dateTimeEdit") - self.horizontalLayout.addWidget(self.dateTimeEdit) - spacerItem = QtWidgets.QSpacerItem(198, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) - self.horizontalLayout.addItem(spacerItem) - self.gridLayout.addLayout(self.horizontalLayout, 1, 1, 1, 1) - self.label_3 = QtWidgets.QLabel(parent=HgShelveDataDialog) - self.label_3.setAlignment(QtCore.Qt.AlignmentFlag.AlignLeading|QtCore.Qt.AlignmentFlag.AlignLeft|QtCore.Qt.AlignmentFlag.AlignTop) - self.label_3.setObjectName("label_3") - self.gridLayout.addWidget(self.label_3, 2, 0, 1, 1) - self.messageEdit = QtWidgets.QLineEdit(parent=HgShelveDataDialog) - self.messageEdit.setObjectName("messageEdit") - self.gridLayout.addWidget(self.messageEdit, 2, 1, 1, 1) - self.addRemoveCheckBox = QtWidgets.QCheckBox(parent=HgShelveDataDialog) - self.addRemoveCheckBox.setObjectName("addRemoveCheckBox") - self.gridLayout.addWidget(self.addRemoveCheckBox, 3, 0, 1, 2) - self.keepCheckBox = QtWidgets.QCheckBox(parent=HgShelveDataDialog) - self.keepCheckBox.setObjectName("keepCheckBox") - self.gridLayout.addWidget(self.keepCheckBox, 4, 0, 1, 2) - self.buttonBox = QtWidgets.QDialogButtonBox(parent=HgShelveDataDialog) - self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal) - self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok) - self.buttonBox.setObjectName("buttonBox") - self.gridLayout.addWidget(self.buttonBox, 5, 0, 1, 2) - - self.retranslateUi(HgShelveDataDialog) - self.buttonBox.accepted.connect(HgShelveDataDialog.accept) # type: ignore - self.buttonBox.rejected.connect(HgShelveDataDialog.reject) # type: ignore - QtCore.QMetaObject.connectSlotsByName(HgShelveDataDialog) - HgShelveDataDialog.setTabOrder(self.nameEdit, self.dateTimeEdit) - HgShelveDataDialog.setTabOrder(self.dateTimeEdit, self.messageEdit) - HgShelveDataDialog.setTabOrder(self.messageEdit, self.addRemoveCheckBox) - HgShelveDataDialog.setTabOrder(self.addRemoveCheckBox, self.buttonBox) - - def retranslateUi(self, HgShelveDataDialog): - _translate = QtCore.QCoreApplication.translate - HgShelveDataDialog.setWindowTitle(_translate("HgShelveDataDialog", "Shelve")) - self.label.setText(_translate("HgShelveDataDialog", "Name:")) - self.nameEdit.setToolTip(_translate("HgShelveDataDialog", "Enter a name for the shelve")) - self.label_2.setText(_translate("HgShelveDataDialog", "Date, Time:")) - self.dateTimeEdit.setStatusTip(_translate("HgShelveDataDialog", "Enter the commit date and time for the shelve")) - self.dateTimeEdit.setDisplayFormat(_translate("HgShelveDataDialog", "yyyy-MM-dd HH:mm")) - self.label_3.setText(_translate("HgShelveDataDialog", "Message:")) - self.messageEdit.setToolTip(_translate("HgShelveDataDialog", "Enter a message for the shelve")) - self.addRemoveCheckBox.setText(_translate("HgShelveDataDialog", "Mark new/missing files as added/removed")) - self.keepCheckBox.setToolTip(_translate("HgShelveDataDialog", "Select to shelve, but keep the changes in the working directory")) - self.keepCheckBox.setText(_translate("HgShelveDataDialog", "Shelve, but keep changes"))
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/Ui_HgShelvesSelectionDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,43 +0,0 @@ -# Form implementation generated from reading ui file 'src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelvesSelectionDialog.ui' -# -# Created by: PyQt6 UI code generator 6.7.0 -# -# WARNING: Any manual changes made to this file will be lost when pyuic6 is -# run again. Do not edit this file unless you know what you are doing. - - -from PyQt6 import QtCore, QtGui, QtWidgets - - -class Ui_HgShelvesSelectionDialog(object): - def setupUi(self, HgShelvesSelectionDialog): - HgShelvesSelectionDialog.setObjectName("HgShelvesSelectionDialog") - HgShelvesSelectionDialog.resize(400, 300) - HgShelvesSelectionDialog.setSizeGripEnabled(True) - self.verticalLayout = QtWidgets.QVBoxLayout(HgShelvesSelectionDialog) - self.verticalLayout.setObjectName("verticalLayout") - self.message = QtWidgets.QLabel(parent=HgShelvesSelectionDialog) - self.message.setText("") - self.message.setObjectName("message") - self.verticalLayout.addWidget(self.message) - self.shelvesList = QtWidgets.QListWidget(parent=HgShelvesSelectionDialog) - self.shelvesList.setAlternatingRowColors(True) - self.shelvesList.setSelectionMode(QtWidgets.QAbstractItemView.SelectionMode.ExtendedSelection) - self.shelvesList.setObjectName("shelvesList") - self.verticalLayout.addWidget(self.shelvesList) - self.buttonBox = QtWidgets.QDialogButtonBox(parent=HgShelvesSelectionDialog) - self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal) - self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok) - self.buttonBox.setObjectName("buttonBox") - self.verticalLayout.addWidget(self.buttonBox) - - self.retranslateUi(HgShelvesSelectionDialog) - self.buttonBox.accepted.connect(HgShelvesSelectionDialog.accept) # type: ignore - self.buttonBox.rejected.connect(HgShelvesSelectionDialog.reject) # type: ignore - QtCore.QMetaObject.connectSlotsByName(HgShelvesSelectionDialog) - HgShelvesSelectionDialog.setTabOrder(self.shelvesList, self.buttonBox) - - def retranslateUi(self, HgShelvesSelectionDialog): - _translate = QtCore.QCoreApplication.translate - HgShelvesSelectionDialog.setWindowTitle(_translate("HgShelvesSelectionDialog", "Mercurial Shelve Selection")) - self.shelvesList.setSortingEnabled(True)
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/Ui_HgUnshelveDataDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,53 +0,0 @@ -# Form implementation generated from reading ui file 'src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui' -# -# Created by: PyQt6 UI code generator 6.7.0 -# -# WARNING: Any manual changes made to this file will be lost when pyuic6 is -# run again. Do not edit this file unless you know what you are doing. - - -from PyQt6 import QtCore, QtGui, QtWidgets - - -class Ui_HgUnshelveDataDialog(object): - def setupUi(self, HgUnshelveDataDialog): - HgUnshelveDataDialog.setObjectName("HgUnshelveDataDialog") - HgUnshelveDataDialog.resize(400, 108) - HgUnshelveDataDialog.setSizeGripEnabled(True) - self.gridLayout = QtWidgets.QGridLayout(HgUnshelveDataDialog) - self.gridLayout.setObjectName("gridLayout") - self.label = QtWidgets.QLabel(parent=HgUnshelveDataDialog) - self.label.setObjectName("label") - self.gridLayout.addWidget(self.label, 0, 0, 1, 1) - self.nameComboBox = QtWidgets.QComboBox(parent=HgUnshelveDataDialog) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.nameComboBox.sizePolicy().hasHeightForWidth()) - self.nameComboBox.setSizePolicy(sizePolicy) - self.nameComboBox.setEditable(True) - self.nameComboBox.setObjectName("nameComboBox") - self.gridLayout.addWidget(self.nameComboBox, 0, 1, 1, 1) - self.keepCheckBox = QtWidgets.QCheckBox(parent=HgUnshelveDataDialog) - self.keepCheckBox.setObjectName("keepCheckBox") - self.gridLayout.addWidget(self.keepCheckBox, 1, 0, 1, 2) - self.buttonBox = QtWidgets.QDialogButtonBox(parent=HgUnshelveDataDialog) - self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal) - self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok) - self.buttonBox.setObjectName("buttonBox") - self.gridLayout.addWidget(self.buttonBox, 2, 0, 1, 2) - - self.retranslateUi(HgUnshelveDataDialog) - self.buttonBox.accepted.connect(HgUnshelveDataDialog.accept) # type: ignore - self.buttonBox.rejected.connect(HgUnshelveDataDialog.reject) # type: ignore - QtCore.QMetaObject.connectSlotsByName(HgUnshelveDataDialog) - HgUnshelveDataDialog.setTabOrder(self.nameComboBox, self.keepCheckBox) - HgUnshelveDataDialog.setTabOrder(self.keepCheckBox, self.buttonBox) - - def retranslateUi(self, HgUnshelveDataDialog): - _translate = QtCore.QCoreApplication.translate - HgUnshelveDataDialog.setWindowTitle(_translate("HgUnshelveDataDialog", "Mercurial Unshelve")) - self.label.setText(_translate("HgUnshelveDataDialog", "Name:")) - self.nameComboBox.setToolTip(_translate("HgUnshelveDataDialog", "Enter the name of the shelve")) - self.keepCheckBox.setToolTip(_translate("HgUnshelveDataDialog", "Select to keep the shelved change")) - self.keepCheckBox.setText(_translate("HgUnshelveDataDialog", "Keep shelved change"))
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> -# - -""" -Package implementing the shelve extension support interface. -"""
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py Sat Nov 30 11:09:02 2024 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,252 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> -# - -""" -Module implementing the shelve extension interface. -""" - -from PyQt6.QtWidgets import QDialog - -from eric7.EricWidgets import EricMessageBox -from eric7.UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog - -from ..HgDialog import HgDialog -from ..HgExtension import HgExtension - - -class Shelve(HgExtension): - """ - Class implementing the shelve extension interface. - """ - - def __init__(self, vcs, ui=None): - """ - Constructor - - @param vcs reference to the Mercurial vcs object - @type Hg - @param ui reference to a UI widget (defaults to None) - @type QWidget - """ - super().__init__(vcs, ui=ui) - - self.__unshelveKeep = False - - self.__shelveBrowserDialog = None - - def shutdown(self): - """ - Public method used to shutdown the shelve interface. - """ - if self.__shelveBrowserDialog is not None: - self.__shelveBrowserDialog.close() - - def __hgGetShelveNamesList(self): - """ - Private method to get the list of shelved changes. - - @return list of shelved changes - @rtype list of str - """ - args = self.vcs.initCommand("shelve") - args.append("--list") - args.append("--quiet") - - client = self.vcs.getClient() - output = client.runcommand(args)[0] - - shelveNamesList = [] - for line in output.splitlines(): - shelveNamesList.append(line.strip()) - - return shelveNamesList[:] - - def hgShelve(self, name): - """ - Public method to shelve current changes of files or directories. - - @param name directory or file name (string) or list of directory - or file names - @type list of str - @return flag indicating that the project should be reread - @rtype bool - """ - from .HgShelveDataDialog import HgShelveDataDialog - - res = False - dlg = HgShelveDataDialog(self.vcs.version, parent=self.ui) - if dlg.exec() == QDialog.DialogCode.Accepted: - shelveName, dateTime, message, addRemove, keep = dlg.getData() - - args = self.vcs.initCommand("shelve") - if shelveName: - args.append("--name") - args.append(shelveName) - if message: - args.append("--message") - args.append(message) - if addRemove: - args.append("--addremove") - if dateTime.isValid(): - args.append("--date") - args.append(dateTime.toString("yyyy-MM-dd hh:mm:ss")) - if self.vcs.version >= (5, 0, 0) and keep: - args.append("--keep") - args.append("-v") - - if isinstance(name, list): - self.vcs.addArguments(args, name) - else: - args.append(name) - - dia = HgDialog( - self.tr("Shelve current changes"), hg=self.vcs, parent=self.ui - ) - res = dia.startProcess(args) - if res: - dia.exec() - res = dia.hasAddOrDelete() - self.vcs.checkVCSStatus() - return res - - def hgShelveBrowser(self): - """ - Public method to show the shelve browser dialog. - """ - from .HgShelveBrowserDialog import HgShelveBrowserDialog - - if self.__shelveBrowserDialog is None: - self.__shelveBrowserDialog = HgShelveBrowserDialog(self.vcs) - self.__shelveBrowserDialog.show() - self.__shelveBrowserDialog.start() - - def hgUnshelve(self, shelveName=""): - """ - Public method to restore shelved changes to the project directory. - - @param shelveName name of the shelve to restore - @type str - @return flag indicating that the project should be reread - @rtype bool - """ - from .HgUnshelveDataDialog import HgUnshelveDataDialog - - res = False - dlg = HgUnshelveDataDialog( - self.__hgGetShelveNamesList(), shelveName=shelveName, parent=self.ui - ) - if dlg.exec() == QDialog.DialogCode.Accepted: - shelveName, keep = dlg.getData() - self.__unshelveKeep = keep # store for potential continue - - args = self.vcs.initCommand("unshelve") - if keep: - args.append("--keep") - if shelveName: - args.append(shelveName) - - dia = HgDialog( - self.tr("Restore shelved changes"), hg=self.vcs, parent=self.ui - ) - res = dia.startProcess(args) - if res: - dia.exec() - res = dia.hasAddOrDelete() - self.vcs.checkVCSStatus() - return res - - def hgUnshelveAbort(self): - """ - Public method to abort the ongoing restore operation. - - @return flag indicating that the project should be reread - @rtype bool - """ - args = self.vcs.initCommand("unshelve") - args.append("--abort") - - dia = HgDialog(self.tr("Abort restore operation"), hg=self.vcs, parent=self.ui) - res = dia.startProcess(args) - if res: - dia.exec() - res = dia.hasAddOrDelete() - self.vcs.checkVCSStatus() - return res - - def hgUnshelveContinue(self): - """ - Public method to continue the ongoing restore operation. - - @return flag indicating that the project should be reread - @rtype bool - """ - args = self.vcs.initCommand("unshelve") - if self.__unshelveKeep: - args.append("--keep") - args.append("--continue") - - dia = HgDialog( - self.tr("Continue restore operation"), hg=self.vcs, parent=self.ui - ) - res = dia.startProcess(args) - if res: - dia.exec() - res = dia.hasAddOrDelete() - self.vcs.checkVCSStatus() - return res - - def hgDeleteShelves(self, shelveNames=None): - """ - Public method to delete named shelves. - - @param shelveNames name of shelves to delete - @type list of str - """ - from .HgShelvesSelectionDialog import HgShelvesSelectionDialog - - if not shelveNames: - dlg = HgShelvesSelectionDialog( - self.tr("Select the shelves to be deleted:"), - self.__hgGetShelveNamesList(), - parent=self.ui, - ) - if dlg.exec() == QDialog.DialogCode.Accepted: - shelveNames = dlg.getSelectedShelves() - else: - return - - dlg = DeleteFilesConfirmationDialog( - self.ui, - self.tr("Delete shelves"), - self.tr("Do you really want to delete these shelves?"), - shelveNames, - ) - if dlg.exec() == QDialog.DialogCode.Accepted: - args = self.vcs.initCommand("shelve") - args.append("--delete") - args.extend(shelveNames) - - dia = HgDialog(self.tr("Delete shelves"), hg=self.vcs, parent=self.ui) - res = dia.startProcess(args) - if res: - dia.exec() - - def hgCleanupShelves(self): - """ - Public method to delete all shelves. - """ - res = EricMessageBox.yesNo( - None, - self.tr("Delete all shelves"), - self.tr("""Do you really want to delete all shelved changes?"""), - ) - if res: - args = self.vcs.initCommand("shelve") - args.append("--cleanup") - - dia = HgDialog(self.tr("Delete all shelves"), hg=self.vcs, parent=self.ui) - res = dia.startProcess(args) - if res: - dia.exec()
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,123 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> -# - -""" -Module implementing a dialog to enter the data to strip changesets. -""" - -from PyQt6.QtCore import pyqtSlot -from PyQt6.QtWidgets import QDialog, QDialogButtonBox - -from .Ui_HgStripDialog import Ui_HgStripDialog - - -class HgStripDialog(QDialog, Ui_HgStripDialog): - """ - Class implementing a dialog to enter the data to strip changesets. - """ - - def __init__(self, tagsList, branchesList, bookmarksList=None, rev="", parent=None): - """ - Constructor - - @param tagsList list of tags - @type list of str - @param branchesList list of branches - @type list of str - @param bookmarksList list of bookmarks - @type list of str - @param rev revision to strip from - @type str - @param parent reference to the parent widget - @type QWidget - """ - super().__init__(parent) - self.setupUi(self) - - self.tagCombo.addItems(sorted(tagsList)) - self.branchCombo.addItems(["default"] + sorted(branchesList)) - if bookmarksList is not None: - self.bookmarkCombo.addItems([""] + sorted(bookmarksList)) - self.idEdit.setText(rev) - - # connect various radio buttons and input fields - self.numberButton.toggled.connect(self.__updateOK) - self.idButton.toggled.connect(self.__updateOK) - self.tagButton.toggled.connect(self.__updateOK) - self.branchButton.toggled.connect(self.__updateOK) - self.expressionButton.toggled.connect(self.__updateOK) - - self.numberSpinBox.valueChanged.connect(self.__updateOK) - - self.idEdit.textChanged.connect(self.__updateOK) - self.expressionEdit.textChanged.connect(self.__updateOK) - - self.tagCombo.editTextChanged.connect(self.__updateOK) - self.branchCombo.editTextChanged.connect(self.__updateOK) - - msh = self.minimumSizeHint() - self.resize(max(self.width(), msh.width()), msh.height()) - - self.__updateOK() - - self.idEdit.setFocus() - - @pyqtSlot() - def __updateOK(self): - """ - Private slot to update the OK button. - """ - enabled = True - if self.numberButton.isChecked(): - enabled = enabled and self.numberSpinBox.value() >= 0 - elif self.idButton.isChecked(): - enabled = enabled and bool(self.idEdit.text()) - elif self.tagButton.isChecked(): - enabled = enabled and bool(self.tagCombo.currentText()) - elif self.branchButton.isChecked(): - enabled = enabled and bool(self.branchCombo.currentText()) - elif self.expressionButton.isChecked(): - enabled = enabled and bool(self.expressionEdit.text()) - - self.buttonBox.button(QDialogButtonBox.StandardButton.Ok).setEnabled(enabled) - - def __getRevision(self): - """ - Private method to generate the revision. - - @return revision - @rtype str - """ - if self.numberButton.isChecked(): - return "rev({0})".format(self.numberSpinBox.value()) - elif self.idButton.isChecked(): - return "id({0})".format(self.idEdit.text()) - elif self.tagButton.isChecked(): - return self.tagCombo.currentText() - elif self.branchButton.isChecked(): - return self.branchCombo.currentText() - elif self.expressionButton.isChecked(): - return self.expressionEdit.text() - else: - # should not happen - return "" - - def getData(self): - """ - Public method to retrieve the data for the strip action. - - @return tuple with the revision, a bookmark name, a flag indicating - to enforce the strip action, a flag indicating to omit the creation - of backup bundles and a flag indicating to not modify the working - directory - @rtype tuple (str, str, bool, bool, bool) - """ - return ( - self.__getRevision(), - self.bookmarkCombo.currentText(), - self.forceCheckBox.isChecked(), - self.noBackupCheckBox.isChecked(), - self.keepCheckBox.isChecked(), - )
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui Sat Nov 30 11:09:02 2024 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,363 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ui version="4.0"> - <class>HgStripDialog</class> - <widget class="QDialog" name="HgStripDialog"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>400</width> - <height>374</height> - </rect> - </property> - <property name="windowTitle"> - <string>Strip Changesets</string> - </property> - <property name="sizeGripEnabled"> - <bool>true</bool> - </property> - <layout class="QVBoxLayout" name="verticalLayout"> - <item> - <widget class="QGroupBox" name="revGroupBox"> - <property name="title"> - <string>&Revision</string> - </property> - <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> - <widget class="QRadioButton" name="numberButton"> - <property name="toolTip"> - <string>Select to specify a revision by number</string> - </property> - <property name="text"> - <string>Number</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QSpinBox" name="numberSpinBox"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="toolTip"> - <string>Enter a revision number</string> - </property> - <property name="alignment"> - <set>Qt::AlignRight</set> - </property> - <property name="minimum"> - <number>-1</number> - </property> - <property name="maximum"> - <number>999999999</number> - </property> - <property name="value"> - <number>-1</number> - </property> - </widget> - </item> - <item row="0" column="2"> - <spacer> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="1" column="0"> - <widget class="QRadioButton" name="idButton"> - <property name="toolTip"> - <string>Select to specify a revision by changeset id</string> - </property> - <property name="text"> - <string>Id:</string> - </property> - <property name="checked"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="1" column="1" colspan="2"> - <widget class="QLineEdit" name="idEdit"> - <property name="toolTip"> - <string>Enter a changeset id</string> - </property> - <property name="clearButtonEnabled"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QRadioButton" name="tagButton"> - <property name="toolTip"> - <string>Select to specify a revision by a tag</string> - </property> - <property name="text"> - <string>Tag:</string> - </property> - </widget> - </item> - <item row="2" column="1" colspan="2"> - <widget class="QComboBox" name="tagCombo"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="toolTip"> - <string>Enter a tag name</string> - </property> - <property name="editable"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="3" column="0"> - <widget class="QRadioButton" name="branchButton"> - <property name="toolTip"> - <string>Select to specify a revision by a branch</string> - </property> - <property name="text"> - <string>Branch:</string> - </property> - </widget> - </item> - <item row="3" column="1" colspan="2"> - <widget class="QComboBox" name="branchCombo"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="toolTip"> - <string>Enter a branch name</string> - </property> - <property name="editable"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="4" column="0"> - <widget class="QRadioButton" name="expressionButton"> - <property name="text"> - <string>Expression:</string> - </property> - </widget> - </item> - <item row="4" column="1" colspan="2"> - <widget class="QLineEdit" name="expressionEdit"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="toolTip"> - <string>Enter a revision set expression</string> - </property> - <property name="clearButtonEnabled"> - <bool>true</bool> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> - <layout class="QGridLayout" name="gridLayout_2"> - <item row="0" column="0"> - <widget class="QLabel" name="label"> - <property name="text"> - <string>Bookmark:</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QComboBox" name="bookmarkCombo"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="toolTip"> - <string>Enter a bookmark name</string> - </property> - <property name="editable"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="1" column="0" colspan="2"> - <widget class="QCheckBox" name="forceCheckBox"> - <property name="toolTip"> - <string>Select to enforce removal of changesets</string> - </property> - <property name="text"> - <string>Enforce Operation</string> - </property> - </widget> - </item> - <item row="2" column="0" colspan="2"> - <widget class="QCheckBox" name="noBackupCheckBox"> - <property name="toolTip"> - <string>Select to not create backup bundles</string> - </property> - <property name="text"> - <string>No Backup</string> - </property> - </widget> - </item> - <item row="3" column="0" colspan="2"> - <widget class="QCheckBox" name="keepCheckBox"> - <property name="toolTip"> - <string>Select to keep the current working directory state</string> - </property> - <property name="text"> - <string>Keep Working Directory</string> - </property> - </widget> - </item> - </layout> - </item> - <item> - <widget class="QDialogButtonBox" name="buttonBox"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="standardButtons"> - <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> - </property> - </widget> - </item> - </layout> - </widget> - <tabstops> - <tabstop>numberButton</tabstop> - <tabstop>numberSpinBox</tabstop> - <tabstop>idButton</tabstop> - <tabstop>idEdit</tabstop> - <tabstop>tagButton</tabstop> - <tabstop>tagCombo</tabstop> - <tabstop>branchButton</tabstop> - <tabstop>branchCombo</tabstop> - <tabstop>expressionButton</tabstop> - <tabstop>expressionEdit</tabstop> - <tabstop>bookmarkCombo</tabstop> - <tabstop>forceCheckBox</tabstop> - <tabstop>noBackupCheckBox</tabstop> - <tabstop>keepCheckBox</tabstop> - </tabstops> - <resources/> - <connections> - <connection> - <sender>buttonBox</sender> - <signal>accepted()</signal> - <receiver>HgStripDialog</receiver> - <slot>accept()</slot> - <hints> - <hint type="sourcelabel"> - <x>257</x> - <y>364</y> - </hint> - <hint type="destinationlabel"> - <x>157</x> - <y>274</y> - </hint> - </hints> - </connection> - <connection> - <sender>buttonBox</sender> - <signal>rejected()</signal> - <receiver>HgStripDialog</receiver> - <slot>reject()</slot> - <hints> - <hint type="sourcelabel"> - <x>325</x> - <y>364</y> - </hint> - <hint type="destinationlabel"> - <x>286</x> - <y>274</y> - </hint> - </hints> - </connection> - <connection> - <sender>numberButton</sender> - <signal>toggled(bool)</signal> - <receiver>numberSpinBox</receiver> - <slot>setEnabled(bool)</slot> - <hints> - <hint type="sourcelabel"> - <x>55</x> - <y>66</y> - </hint> - <hint type="destinationlabel"> - <x>215</x> - <y>68</y> - </hint> - </hints> - </connection> - <connection> - <sender>idButton</sender> - <signal>toggled(bool)</signal> - <receiver>idEdit</receiver> - <slot>setEnabled(bool)</slot> - <hints> - <hint type="sourcelabel"> - <x>68</x> - <y>99</y> - </hint> - <hint type="destinationlabel"> - <x>227</x> - <y>100</y> - </hint> - </hints> - </connection> - <connection> - <sender>tagButton</sender> - <signal>toggled(bool)</signal> - <receiver>tagCombo</receiver> - <slot>setEnabled(bool)</slot> - <hints> - <hint type="sourcelabel"> - <x>65</x> - <y>131</y> - </hint> - <hint type="destinationlabel"> - <x>224</x> - <y>132</y> - </hint> - </hints> - </connection> - <connection> - <sender>branchButton</sender> - <signal>toggled(bool)</signal> - <receiver>branchCombo</receiver> - <slot>setEnabled(bool)</slot> - <hints> - <hint type="sourcelabel"> - <x>73</x> - <y>163</y> - </hint> - <hint type="destinationlabel"> - <x>231</x> - <y>164</y> - </hint> - </hints> - </connection> - <connection> - <sender>expressionButton</sender> - <signal>toggled(bool)</signal> - <receiver>expressionEdit</receiver> - <slot>setEnabled(bool)</slot> - <hints> - <hint type="sourcelabel"> - <x>74</x> - <y>183</y> - </hint> - <hint type="destinationlabel"> - <x>154</x> - <y>180</y> - </hint> - </hints> - </connection> - </connections> -</ui>
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py Sat Nov 30 11:09:02 2024 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,96 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> -# - -""" -Module implementing the strip extension project helper. -""" - -from PyQt6.QtWidgets import QMenu - -from eric7.EricGui import EricPixmapCache -from eric7.EricGui.EricAction import EricAction -from eric7.EricWidgets import EricMessageBox - -from ..HgExtensionProjectHelper import HgExtensionProjectHelper - - -class StripProjectHelper(HgExtensionProjectHelper): - """ - Class implementing the strip extension project helper. - """ - - def __init__(self): - """ - Constructor - """ - super().__init__() - - def initActions(self): - """ - Public method to generate the action objects. - """ - self.hgStripAct = EricAction( - self.tr("Strip changesets"), - EricPixmapCache.getIcon("fileDelete"), - self.tr("Strip changesets"), - 0, - 0, - self, - "mercurial_strip", - ) - self.hgStripAct.setStatusTip(self.tr("Strip changesets from a repository")) - self.hgStripAct.setWhatsThis( - self.tr( - """<b>Strip changesets</b>""" - """<p>This deletes a changeset and all its descendants""" - """ from a repository. Each removed changeset will be""" - """ stored in .hg/strip-backup as a bundle file.</p>""" - ) - ) - self.hgStripAct.triggered.connect(self.__hgStrip) - self.actions.append(self.hgStripAct) - - def initMenu(self, mainMenu): - """ - Public method to generate the extension menu. - - @param mainMenu reference to the main menu - @type QMenu - @return populated menu - @rtype QMenu - """ - menu = QMenu(self.menuTitle(), mainMenu) - menu.setIcon(EricPixmapCache.getIcon("fileDelete")) - menu.setTearOffEnabled(True) - - menu.addAction(self.hgStripAct) - - return menu - - def menuTitle(self): - """ - Public method to get the menu title. - - @return title of the menu - @rtype str - """ - return self.tr("Strip") - - def __hgStrip(self): - """ - Private slot used to strip revisions from a repository. - """ - shouldReopen = self.vcs.getExtensionObject("strip").hgStrip( - self.project.getProjectPath() - ) - if shouldReopen: - res = EricMessageBox.yesNo( - None, - self.tr("Strip"), - self.tr("""The project should be reread. Do this now?"""), - yesDefault=True, - ) - if res: - self.project.reopenProject()
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/StripExtension/Ui_HgStripDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,147 +0,0 @@ -# Form implementation generated from reading ui file 'src/eric7/Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui' -# -# Created by: PyQt6 UI code generator 6.7.0 -# -# WARNING: Any manual changes made to this file will be lost when pyuic6 is -# run again. Do not edit this file unless you know what you are doing. - - -from PyQt6 import QtCore, QtGui, QtWidgets - - -class Ui_HgStripDialog(object): - def setupUi(self, HgStripDialog): - HgStripDialog.setObjectName("HgStripDialog") - HgStripDialog.resize(400, 374) - HgStripDialog.setSizeGripEnabled(True) - self.verticalLayout = QtWidgets.QVBoxLayout(HgStripDialog) - self.verticalLayout.setObjectName("verticalLayout") - self.revGroupBox = QtWidgets.QGroupBox(parent=HgStripDialog) - self.revGroupBox.setObjectName("revGroupBox") - self.gridLayout = QtWidgets.QGridLayout(self.revGroupBox) - self.gridLayout.setObjectName("gridLayout") - self.numberButton = QtWidgets.QRadioButton(parent=self.revGroupBox) - self.numberButton.setObjectName("numberButton") - self.gridLayout.addWidget(self.numberButton, 0, 0, 1, 1) - self.numberSpinBox = QtWidgets.QSpinBox(parent=self.revGroupBox) - self.numberSpinBox.setEnabled(False) - self.numberSpinBox.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight) - self.numberSpinBox.setMinimum(-1) - self.numberSpinBox.setMaximum(999999999) - self.numberSpinBox.setProperty("value", -1) - self.numberSpinBox.setObjectName("numberSpinBox") - self.gridLayout.addWidget(self.numberSpinBox, 0, 1, 1, 1) - spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) - self.gridLayout.addItem(spacerItem, 0, 2, 1, 1) - self.idButton = QtWidgets.QRadioButton(parent=self.revGroupBox) - self.idButton.setChecked(True) - self.idButton.setObjectName("idButton") - self.gridLayout.addWidget(self.idButton, 1, 0, 1, 1) - self.idEdit = QtWidgets.QLineEdit(parent=self.revGroupBox) - self.idEdit.setClearButtonEnabled(True) - self.idEdit.setObjectName("idEdit") - self.gridLayout.addWidget(self.idEdit, 1, 1, 1, 2) - self.tagButton = QtWidgets.QRadioButton(parent=self.revGroupBox) - self.tagButton.setObjectName("tagButton") - self.gridLayout.addWidget(self.tagButton, 2, 0, 1, 1) - self.tagCombo = QtWidgets.QComboBox(parent=self.revGroupBox) - self.tagCombo.setEnabled(False) - self.tagCombo.setEditable(True) - self.tagCombo.setObjectName("tagCombo") - self.gridLayout.addWidget(self.tagCombo, 2, 1, 1, 2) - self.branchButton = QtWidgets.QRadioButton(parent=self.revGroupBox) - self.branchButton.setObjectName("branchButton") - self.gridLayout.addWidget(self.branchButton, 3, 0, 1, 1) - self.branchCombo = QtWidgets.QComboBox(parent=self.revGroupBox) - self.branchCombo.setEnabled(False) - self.branchCombo.setEditable(True) - self.branchCombo.setObjectName("branchCombo") - self.gridLayout.addWidget(self.branchCombo, 3, 1, 1, 2) - self.expressionButton = QtWidgets.QRadioButton(parent=self.revGroupBox) - self.expressionButton.setObjectName("expressionButton") - self.gridLayout.addWidget(self.expressionButton, 4, 0, 1, 1) - self.expressionEdit = QtWidgets.QLineEdit(parent=self.revGroupBox) - self.expressionEdit.setEnabled(False) - self.expressionEdit.setClearButtonEnabled(True) - self.expressionEdit.setObjectName("expressionEdit") - self.gridLayout.addWidget(self.expressionEdit, 4, 1, 1, 2) - self.verticalLayout.addWidget(self.revGroupBox) - self.gridLayout_2 = QtWidgets.QGridLayout() - self.gridLayout_2.setObjectName("gridLayout_2") - self.label = QtWidgets.QLabel(parent=HgStripDialog) - self.label.setObjectName("label") - self.gridLayout_2.addWidget(self.label, 0, 0, 1, 1) - self.bookmarkCombo = QtWidgets.QComboBox(parent=HgStripDialog) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.bookmarkCombo.sizePolicy().hasHeightForWidth()) - self.bookmarkCombo.setSizePolicy(sizePolicy) - self.bookmarkCombo.setEditable(True) - self.bookmarkCombo.setObjectName("bookmarkCombo") - self.gridLayout_2.addWidget(self.bookmarkCombo, 0, 1, 1, 1) - self.forceCheckBox = QtWidgets.QCheckBox(parent=HgStripDialog) - self.forceCheckBox.setObjectName("forceCheckBox") - self.gridLayout_2.addWidget(self.forceCheckBox, 1, 0, 1, 2) - self.noBackupCheckBox = QtWidgets.QCheckBox(parent=HgStripDialog) - self.noBackupCheckBox.setObjectName("noBackupCheckBox") - self.gridLayout_2.addWidget(self.noBackupCheckBox, 2, 0, 1, 2) - self.keepCheckBox = QtWidgets.QCheckBox(parent=HgStripDialog) - self.keepCheckBox.setObjectName("keepCheckBox") - self.gridLayout_2.addWidget(self.keepCheckBox, 3, 0, 1, 2) - self.verticalLayout.addLayout(self.gridLayout_2) - self.buttonBox = QtWidgets.QDialogButtonBox(parent=HgStripDialog) - self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal) - self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok) - self.buttonBox.setObjectName("buttonBox") - self.verticalLayout.addWidget(self.buttonBox) - - self.retranslateUi(HgStripDialog) - self.buttonBox.accepted.connect(HgStripDialog.accept) # type: ignore - self.buttonBox.rejected.connect(HgStripDialog.reject) # type: ignore - self.numberButton.toggled['bool'].connect(self.numberSpinBox.setEnabled) # type: ignore - self.idButton.toggled['bool'].connect(self.idEdit.setEnabled) # type: ignore - self.tagButton.toggled['bool'].connect(self.tagCombo.setEnabled) # type: ignore - self.branchButton.toggled['bool'].connect(self.branchCombo.setEnabled) # type: ignore - self.expressionButton.toggled['bool'].connect(self.expressionEdit.setEnabled) # type: ignore - QtCore.QMetaObject.connectSlotsByName(HgStripDialog) - HgStripDialog.setTabOrder(self.numberButton, self.numberSpinBox) - HgStripDialog.setTabOrder(self.numberSpinBox, self.idButton) - HgStripDialog.setTabOrder(self.idButton, self.idEdit) - HgStripDialog.setTabOrder(self.idEdit, self.tagButton) - HgStripDialog.setTabOrder(self.tagButton, self.tagCombo) - HgStripDialog.setTabOrder(self.tagCombo, self.branchButton) - HgStripDialog.setTabOrder(self.branchButton, self.branchCombo) - HgStripDialog.setTabOrder(self.branchCombo, self.expressionButton) - HgStripDialog.setTabOrder(self.expressionButton, self.expressionEdit) - HgStripDialog.setTabOrder(self.expressionEdit, self.bookmarkCombo) - HgStripDialog.setTabOrder(self.bookmarkCombo, self.forceCheckBox) - HgStripDialog.setTabOrder(self.forceCheckBox, self.noBackupCheckBox) - HgStripDialog.setTabOrder(self.noBackupCheckBox, self.keepCheckBox) - - def retranslateUi(self, HgStripDialog): - _translate = QtCore.QCoreApplication.translate - HgStripDialog.setWindowTitle(_translate("HgStripDialog", "Strip Changesets")) - self.revGroupBox.setTitle(_translate("HgStripDialog", "&Revision")) - self.numberButton.setToolTip(_translate("HgStripDialog", "Select to specify a revision by number")) - self.numberButton.setText(_translate("HgStripDialog", "Number")) - self.numberSpinBox.setToolTip(_translate("HgStripDialog", "Enter a revision number")) - self.idButton.setToolTip(_translate("HgStripDialog", "Select to specify a revision by changeset id")) - self.idButton.setText(_translate("HgStripDialog", "Id:")) - self.idEdit.setToolTip(_translate("HgStripDialog", "Enter a changeset id")) - self.tagButton.setToolTip(_translate("HgStripDialog", "Select to specify a revision by a tag")) - self.tagButton.setText(_translate("HgStripDialog", "Tag:")) - self.tagCombo.setToolTip(_translate("HgStripDialog", "Enter a tag name")) - self.branchButton.setToolTip(_translate("HgStripDialog", "Select to specify a revision by a branch")) - self.branchButton.setText(_translate("HgStripDialog", "Branch:")) - self.branchCombo.setToolTip(_translate("HgStripDialog", "Enter a branch name")) - self.expressionButton.setText(_translate("HgStripDialog", "Expression:")) - self.expressionEdit.setToolTip(_translate("HgStripDialog", "Enter a revision set expression")) - self.label.setText(_translate("HgStripDialog", "Bookmark:")) - self.bookmarkCombo.setToolTip(_translate("HgStripDialog", "Enter a bookmark name")) - self.forceCheckBox.setToolTip(_translate("HgStripDialog", "Select to enforce removal of changesets")) - self.forceCheckBox.setText(_translate("HgStripDialog", "Enforce Operation")) - self.noBackupCheckBox.setToolTip(_translate("HgStripDialog", "Select to not create backup bundles")) - self.noBackupCheckBox.setText(_translate("HgStripDialog", "No Backup")) - self.keepCheckBox.setToolTip(_translate("HgStripDialog", "Select to keep the current working directory state")) - self.keepCheckBox.setText(_translate("HgStripDialog", "Keep Working Directory"))
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/StripExtension/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> -# - -""" -Package implementing the strip extension support interface. -"""
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/StripExtension/strip.py Sat Nov 30 11:09:02 2024 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,77 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> -# - -""" -Module implementing the strip extension interface. -""" - -from PyQt6.QtWidgets import QDialog - -from ..HgDialog import HgDialog -from ..HgExtension import HgExtension - - -class Strip(HgExtension): - """ - Class implementing the strip extension interface. - """ - - def __init__(self, vcs, ui=None): - """ - Constructor - - @param vcs reference to the Mercurial vcs object - @type Hg - @param ui reference to a UI widget (defaults to None) - @type QWidget - """ - super().__init__(vcs, ui=ui) - - def hgStrip(self, rev=""): - """ - Public method to strip revisions from a repository. - - @param rev revision to strip from - @type str - @return flag indicating that the project should be reread - @rtype bool - """ - from .HgStripDialog import HgStripDialog - - res = False - dlg = HgStripDialog( - self.vcs.hgGetTagsList(), - self.vcs.hgGetBranchesList(), - self.vcs.hgGetBookmarksList(), - rev, - parent=self.ui, - ) - if dlg.exec() == QDialog.DialogCode.Accepted: - rev, bookmark, force, noBackup, keep = dlg.getData() - - args = self.vcs.initCommand("strip") - if bookmark: - args.append("--bookmark") - args.append(bookmark) - if force: - args.append("--force") - if noBackup: - args.append("--no-backup") - if keep: - args.append("--keep") - args.append("-v") - args.append(rev) - - dia = HgDialog( - self.tr("Stripping changesets from repository"), - hg=self.vcs, - parent=self.ui, - ) - res = dia.startProcess(args) - if res: - dia.exec() - res = dia.hasAddOrDelete() - self.vcs.checkVCSStatus() - return res
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/Ui_HgDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/Ui_HgDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # Form implementation generated from reading ui file 'src/eric7/Plugins/VcsPlugins/vcsMercurial/HgDialog.ui' # -# Created by: PyQt6 UI code generator 6.7.0 +# Created by: PyQt6 UI code generator 6.7.1 # # WARNING: Any manual changes made to this file will be lost when pyuic6 is # run again. Do not edit this file unless you know what you are doing. @@ -31,6 +31,24 @@ self.resultbox.setObjectName("resultbox") self.vboxlayout.addWidget(self.resultbox) self.verticalLayout.addWidget(self.outputGroup) + self.progressWidget = QtWidgets.QWidget(parent=HgDialog) + self.progressWidget.setObjectName("progressWidget") + self.horizontalLayout = QtWidgets.QHBoxLayout(self.progressWidget) + self.horizontalLayout.setContentsMargins(0, 0, 0, 0) + self.horizontalLayout.setObjectName("horizontalLayout") + self.topicLabel = QtWidgets.QLabel(parent=self.progressWidget) + self.topicLabel.setText("Topic") + self.topicLabel.setObjectName("topicLabel") + self.horizontalLayout.addWidget(self.topicLabel) + self.progressBar = QtWidgets.QProgressBar(parent=self.progressWidget) + self.progressBar.setProperty("value", 24) + self.progressBar.setObjectName("progressBar") + self.horizontalLayout.addWidget(self.progressBar) + self.remainingTimeLabel = QtWidgets.QLabel(parent=self.progressWidget) + self.remainingTimeLabel.setText("") + self.remainingTimeLabel.setObjectName("remainingTimeLabel") + self.horizontalLayout.addWidget(self.remainingTimeLabel) + self.verticalLayout.addWidget(self.progressWidget) self.errorGroup = QtWidgets.QGroupBox(parent=HgDialog) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Expanding) sizePolicy.setHorizontalStretch(0) @@ -79,6 +97,7 @@ _translate = QtCore.QCoreApplication.translate HgDialog.setWindowTitle(_translate("HgDialog", "Mercurial")) self.outputGroup.setTitle(_translate("HgDialog", "Output")) + self.progressBar.setFormat(_translate("HgDialog", "%v/%m")) self.errorGroup.setTitle(_translate("HgDialog", "Errors")) self.inputGroup.setTitle(_translate("HgDialog", "Input")) self.sendButton.setToolTip(_translate("HgDialog", "Press to send the input to the Mercurial process"))
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/Ui_HgUserConfigDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/Ui_HgUserConfigDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # Form implementation generated from reading ui file 'src/eric7/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui' # -# Created by: PyQt6 UI code generator 6.7.0 +# Created by: PyQt6 UI code generator 6.7.1 # # WARNING: Any manual changes made to this file will be lost when pyuic6 is # run again. Do not edit this file unless you know what you are doing. @@ -57,30 +57,27 @@ self.closeheadCheckBox = QtWidgets.QCheckBox(parent=self.groupBox_2) self.closeheadCheckBox.setObjectName("closeheadCheckBox") self.gridLayout_2.addWidget(self.closeheadCheckBox, 0, 0, 1, 1) - self.gpgCheckBox = QtWidgets.QCheckBox(parent=self.groupBox_2) - self.gpgCheckBox.setObjectName("gpgCheckBox") - self.gridLayout_2.addWidget(self.gpgCheckBox, 0, 1, 1, 1) - self.histeditCheckBox = QtWidgets.QCheckBox(parent=self.groupBox_2) - self.histeditCheckBox.setObjectName("histeditCheckBox") - self.gridLayout_2.addWidget(self.histeditCheckBox, 1, 0, 1, 1) - self.largefilesCheckBox = QtWidgets.QCheckBox(parent=self.groupBox_2) - self.largefilesCheckBox.setObjectName("largefilesCheckBox") - self.gridLayout_2.addWidget(self.largefilesCheckBox, 1, 1, 1, 1) - self.purgeCheckBox = QtWidgets.QCheckBox(parent=self.groupBox_2) - self.purgeCheckBox.setObjectName("purgeCheckBox") - self.gridLayout_2.addWidget(self.purgeCheckBox, 2, 0, 1, 1) + self.rebaseCheckBox = QtWidgets.QCheckBox(parent=self.groupBox_2) + self.rebaseCheckBox.setObjectName("rebaseCheckBox") + self.gridLayout_2.addWidget(self.rebaseCheckBox, 3, 0, 1, 1) self.queuesCheckBox = QtWidgets.QCheckBox(parent=self.groupBox_2) self.queuesCheckBox.setObjectName("queuesCheckBox") self.gridLayout_2.addWidget(self.queuesCheckBox, 2, 1, 1, 1) - self.rebaseCheckBox = QtWidgets.QCheckBox(parent=self.groupBox_2) - self.rebaseCheckBox.setObjectName("rebaseCheckBox") - self.gridLayout_2.addWidget(self.rebaseCheckBox, 3, 0, 1, 1) - self.shelveCheckBox = QtWidgets.QCheckBox(parent=self.groupBox_2) - self.shelveCheckBox.setObjectName("shelveCheckBox") - self.gridLayout_2.addWidget(self.shelveCheckBox, 3, 1, 1, 1) - self.stripCheckBox = QtWidgets.QCheckBox(parent=self.groupBox_2) - self.stripCheckBox.setObjectName("stripCheckBox") - self.gridLayout_2.addWidget(self.stripCheckBox, 4, 0, 1, 1) + self.largefilesCheckBox = QtWidgets.QCheckBox(parent=self.groupBox_2) + self.largefilesCheckBox.setObjectName("largefilesCheckBox") + self.gridLayout_2.addWidget(self.largefilesCheckBox, 2, 0, 1, 1) + self.histeditCheckBox = QtWidgets.QCheckBox(parent=self.groupBox_2) + self.histeditCheckBox.setObjectName("histeditCheckBox") + self.gridLayout_2.addWidget(self.histeditCheckBox, 1, 1, 1, 1) + self.gpgCheckBox = QtWidgets.QCheckBox(parent=self.groupBox_2) + self.gpgCheckBox.setObjectName("gpgCheckBox") + self.gridLayout_2.addWidget(self.gpgCheckBox, 1, 0, 1, 1) + self.fastexportCheckBox = QtWidgets.QCheckBox(parent=self.groupBox_2) + self.fastexportCheckBox.setObjectName("fastexportCheckBox") + self.gridLayout_2.addWidget(self.fastexportCheckBox, 0, 1, 1, 1) + self.uncommitCheckBox = QtWidgets.QCheckBox(parent=self.groupBox_2) + self.uncommitCheckBox.setObjectName("uncommitCheckBox") + self.gridLayout_2.addWidget(self.uncommitCheckBox, 3, 1, 1, 1) self.verticalLayout_2.addWidget(self.groupBox_2) self.largefilesGroup = QtWidgets.QGroupBox(parent=self.tab_2) self.largefilesGroup.setEnabled(False) @@ -253,7 +250,14 @@ HgUserConfigDialog.setTabOrder(self.tabWidget, self.userNameEdit) HgUserConfigDialog.setTabOrder(self.userNameEdit, self.emailEdit) HgUserConfigDialog.setTabOrder(self.emailEdit, self.closeheadCheckBox) - HgUserConfigDialog.setTabOrder(self.closeheadCheckBox, self.lfFileSizeSpinBox) + HgUserConfigDialog.setTabOrder(self.closeheadCheckBox, self.fastexportCheckBox) + HgUserConfigDialog.setTabOrder(self.fastexportCheckBox, self.gpgCheckBox) + HgUserConfigDialog.setTabOrder(self.gpgCheckBox, self.histeditCheckBox) + HgUserConfigDialog.setTabOrder(self.histeditCheckBox, self.largefilesCheckBox) + HgUserConfigDialog.setTabOrder(self.largefilesCheckBox, self.queuesCheckBox) + HgUserConfigDialog.setTabOrder(self.queuesCheckBox, self.rebaseCheckBox) + HgUserConfigDialog.setTabOrder(self.rebaseCheckBox, self.uncommitCheckBox) + HgUserConfigDialog.setTabOrder(self.uncommitCheckBox, self.lfFileSizeSpinBox) HgUserConfigDialog.setTabOrder(self.lfFileSizeSpinBox, self.lfFilePatternsEdit) HgUserConfigDialog.setTabOrder(self.lfFilePatternsEdit, self.lfUserCachePicker) HgUserConfigDialog.setTabOrder(self.lfUserCachePicker, self.proxyHostEdit) @@ -286,22 +290,20 @@ self.groupBox_2.setTitle(_translate("HgUserConfigDialog", "Extensions")) self.closeheadCheckBox.setToolTip(_translate("HgUserConfigDialog", "Select to activate the closehead extension")) self.closeheadCheckBox.setText(_translate("HgUserConfigDialog", "Close Head")) - self.gpgCheckBox.setToolTip(_translate("HgUserConfigDialog", "Select to activate the GPG extension")) - self.gpgCheckBox.setText(_translate("HgUserConfigDialog", "GPG")) - self.histeditCheckBox.setToolTip(_translate("HgUserConfigDialog", "Select to activate the histedit extension")) - self.histeditCheckBox.setText(_translate("HgUserConfigDialog", "Histedit")) + self.rebaseCheckBox.setToolTip(_translate("HgUserConfigDialog", "Select to activate the rebase extension")) + self.rebaseCheckBox.setText(_translate("HgUserConfigDialog", "Rebase")) + self.queuesCheckBox.setToolTip(_translate("HgUserConfigDialog", "Select to activate the queues extension")) + self.queuesCheckBox.setText(_translate("HgUserConfigDialog", "Queues")) self.largefilesCheckBox.setToolTip(_translate("HgUserConfigDialog", "Select to activate the largefiles extension")) self.largefilesCheckBox.setText(_translate("HgUserConfigDialog", "Large Files")) - self.purgeCheckBox.setToolTip(_translate("HgUserConfigDialog", "Select to activate the Purge extension")) - self.purgeCheckBox.setText(_translate("HgUserConfigDialog", "Purge")) - self.queuesCheckBox.setToolTip(_translate("HgUserConfigDialog", "Select to activate the queues extension")) - self.queuesCheckBox.setText(_translate("HgUserConfigDialog", "Queues")) - self.rebaseCheckBox.setToolTip(_translate("HgUserConfigDialog", "Select to activate the rebase extension")) - self.rebaseCheckBox.setText(_translate("HgUserConfigDialog", "Rebase")) - self.shelveCheckBox.setToolTip(_translate("HgUserConfigDialog", "Select to activate the shelve extension")) - self.shelveCheckBox.setText(_translate("HgUserConfigDialog", "Shelve")) - self.stripCheckBox.setToolTip(_translate("HgUserConfigDialog", "Select to activate the strip extension")) - self.stripCheckBox.setText(_translate("HgUserConfigDialog", "Strip")) + self.histeditCheckBox.setToolTip(_translate("HgUserConfigDialog", "Select to activate the histedit extension")) + self.histeditCheckBox.setText(_translate("HgUserConfigDialog", "Histedit")) + self.gpgCheckBox.setToolTip(_translate("HgUserConfigDialog", "Select to activate the GPG extension")) + self.gpgCheckBox.setText(_translate("HgUserConfigDialog", "GPG")) + self.fastexportCheckBox.setToolTip(_translate("HgUserConfigDialog", "Select to activate the fastexport extension")) + self.fastexportCheckBox.setText(_translate("HgUserConfigDialog", "Fastexport")) + self.uncommitCheckBox.setToolTip(_translate("HgUserConfigDialog", "Select to activate the uncommit extension")) + self.uncommitCheckBox.setText(_translate("HgUserConfigDialog", "Uncommit")) self.largefilesGroup.setTitle(_translate("HgUserConfigDialog", "Large Files")) self.label_4.setText(_translate("HgUserConfigDialog", "Minimum file size:")) self.lfFileSizeSpinBox.setToolTip(_translate("HgUserConfigDialog", "Enter the minimum file size in MB for files to be treated as Large Files"))
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,108 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2025 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a dialog to enter the uncommit data. +""" + +from PyQt6.QtCore import QDateTime, Qt, pyqtSlot +from PyQt6.QtWidgets import QDialog + +from eric7.EricWidgets.EricApplication import ericApp + +from .Ui_HgUncommitDialog import Ui_HgUncommitDialog + + +class HgUncommitDialog(QDialog, Ui_HgUncommitDialog): + """ + Class implementing a dialog to enter the uncommit data. + """ + + def __init__(self, vcs, parent=None): + """ + Constructor + + @param vcs reference to the version control object + @type Hg + @param parent reference to the parent widget (defaults to None) + @type QWidget (optional) + """ + super().__init__(parent) + self.setupUi(self) + + self.__vcs = vcs + + project = ericApp().getObject("Project") + pwl, pel = project.getProjectDictionaries() + language = project.getProjectSpellLanguage() + self.logEdit.setLanguageWithPWL(language, pwl or None, pel or None) + + commitMessages = self.__vcs.vcsCommitMessages() + self.recentComboBox.clear() + self.recentComboBox.addItem("") + for message in commitMessages: + abbrMsg = message[:60] + if len(message) > 60: + abbrMsg += "..." + self.recentComboBox.addItem(abbrMsg, message) + + commitAuthors = self.__vcs.getPlugin().getPreferences("CommitAuthors") + self.authorComboBox.clear() + self.authorComboBox.addItem("") + self.authorComboBox.addItems(commitAuthors) + + self.dateTimeEdit.setDateTime(QDateTime.currentDateTime()) + + self.logEdit.setFocus(Qt.FocusReason.OtherFocusReason) + + @pyqtSlot(int) + def on_recentComboBox_activated(self, index): + """ + Private slot to select a commit message from recent ones. + + @param index index of the selected entry + @type int + """ + txt = self.recentComboBox.itemText(index) + if txt: + self.logEdit.setPlainText(self.recentComboBox.currentData()) + + def getUncommitData(self): + """ + Public method to retrieve the entered uncommit data. + + @return tuple containing the commit message, a flag indicating to + allow an empty commit, a flag indicating to allow an uncommit + with outstanding changes, name of the author and date/time of + the commit + @rtype tuple of (str, bool, bool, str, str) + """ + msg = self.logEdit.toPlainText() + if msg: + self.__vcs.vcsAddCommitMessage(msg) + + author = self.authorComboBox.currentText() + if author: + commitAuthors = self.__vcs.getPlugin().getPreferences("CommitAuthors") + if author in commitAuthors: + commitAuthors.remove(author) + commitAuthors.insert(0, author) + no = self.__vcs.getPlugin().getPreferences("CommitAuthorsLimit") + del commitAuthors[no:] + self.__vcs.getPlugin().setPreferences("CommitAuthors", commitAuthors) + + dateTime = ( + self.dateTimeEdit.dateTime().toString("yyyy-MM-dd hh:mm") + if self.dateTimeGroup.isChecked() + else "" + ) + + return ( + msg, + self.keepCheckBox.isChecked(), + self.allowDirtyCheckBox.isChecked(), + author, + dateTime, + )
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,223 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>HgUncommitDialog</class> + <widget class="QDialog" name="HgUncommitDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>450</width> + <height>500</height> + </rect> + </property> + <property name="windowTitle"> + <string>Undo Local Commit</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout_3"> + <item> + <widget class="QGroupBox" name="logGroup"> + <property name="title"> + <string>Commit Message</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="EricSpellCheckedTextEdit" name="logEdit"> + <property name="toolTip"> + <string>Enter the log message.</string> + </property> + <property name="whatsThis"> + <string><b>Log Message</b> +<p>Enter the log message for the uncommit action.</p></string> + </property> + <property name="tabChangesFocus"> + <bool>true</bool> + </property> + <property name="acceptRichText"> + <bool>false</bool> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Recent commit messages</string> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="recentComboBox"> + <property name="toolTip"> + <string>Select a recent commit message to use</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QCheckBox" name="keepCheckBox"> + <property name="toolTip"> + <string>Select to allow an empty commit after undoing it.</string> + </property> + <property name="text"> + <string>Allow empty commit after undoing commit</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="allowDirtyCheckBox"> + <property name="toolTip"> + <string>Select to allow undoing the commit with outstanding changes.</string> + </property> + <property name="text"> + <string>Allow undoing commit with outstanding changes</string> + </property> + </widget> + </item> + <item> + <widget class="QGroupBox" name="groupBox"> + <property name="title"> + <string>Author</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>Enter author name to override the configured user:</string> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="authorComboBox"> + <property name="toolTip"> + <string>Enter an author name in order to override the configured one</string> + </property> + <property name="editable"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="dateTimeGroup"> + <property name="toolTip"> + <string>Select to give date and time information</string> + </property> + <property name="title"> + <string>Date and Time</string> + </property> + <property name="checkable"> + <bool>true</bool> + </property> + <property name="checked"> + <bool>false</bool> + </property> + <layout class="QGridLayout" name="gridLayout_2"> + <item row="0" column="2"> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Orientation::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>241</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="0" column="0"> + <widget class="QLabel" name="label_4"> + <property name="text"> + <string>Date/Time:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QDateTimeEdit" name="dateTimeEdit"> + <property name="toolTip"> + <string>Enter the date and time to be used</string> + </property> + <property name="displayFormat"> + <string notr="true">yyyy-MM-dd hh:mm</string> + </property> + <property name="calendarPopup"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Orientation::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok</set> + </property> + </widget> + </item> + </layout> + </widget> + <customwidgets> + <customwidget> + <class>EricSpellCheckedTextEdit</class> + <extends>QTextEdit</extends> + <header>eric7/EricWidgets/EricSpellCheckedTextEdit.h</header> + </customwidget> + </customwidgets> + <tabstops> + <tabstop>logEdit</tabstop> + <tabstop>recentComboBox</tabstop> + <tabstop>keepCheckBox</tabstop> + <tabstop>allowDirtyCheckBox</tabstop> + <tabstop>authorComboBox</tabstop> + <tabstop>dateTimeGroup</tabstop> + <tabstop>dateTimeEdit</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>HgUncommitDialog</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>248</x> + <y>254</y> + </hint> + <hint type="destinationlabel"> + <x>157</x> + <y>274</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>HgUncommitDialog</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>316</x> + <y>260</y> + </hint> + <hint type="destinationlabel"> + <x>286</x> + <y>274</y> + </hint> + </hints> + </connection> + </connections> +</ui>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,145 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2025 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing the uncommit extension project browser helper. +""" + +from PyQt6.QtCore import pyqtSlot +from PyQt6.QtWidgets import QMenu + +from eric7.EricGui import EricPixmapCache +from eric7.EricWidgets import EricMessageBox + +from ..HgExtensionProjectBrowserHelper import HgExtensionProjectBrowserHelper + + +class UncommitProjectBrowserHelper(HgExtensionProjectBrowserHelper): + """ + Class implementing the uncommit extension project browser helper. + """ + + def __init__(self, vcsObject, browserObject, projectObject): + """ + Constructor + + @param vcsObject reference to the vcs object + @type Hg + @param browserObject reference to the project browser object + @type ProjectBaseBrowser + @param projectObject reference to the project object + @type Project + """ + super().__init__(vcsObject, browserObject, projectObject) + + def initMenus(self): + """ + Public method to generate the extension menus. + + @return dictionary of populated menu. The dict must have the keys 'mainMenu', + 'multiMenu', 'backMenu', 'dirMenu' and 'dirMultiMenu'. + @rtype dict of QMenu + """ + self.__menus = {} + + menu = QMenu(self.menuTitle()) + menu.setIcon(EricPixmapCache.getIcon("vcsUncommit")) + menu.setTearOffEnabled(True) + menu.addAction( + EricPixmapCache.getIcon("vcsUncommit"), + self.tr("Undo Local Commit"), + self.__hgUncommit, + ) + self.__menus["mainMenu"] = menu + + menu = QMenu(self.menuTitle()) + menu.setIcon(EricPixmapCache.getIcon("vcsUncommit")) + menu.setTearOffEnabled(True) + menu.addAction( + EricPixmapCache.getIcon("vcsUncommit"), + self.tr("Undo Local Commit"), + self.__hgUncommit, + ) + self.__menus["multiMenu"] = menu + + menu = QMenu(self.menuTitle()) + menu.setIcon(EricPixmapCache.getIcon("vcsUncommit")) + menu.setTearOffEnabled(True) + menu.addAction( + EricPixmapCache.getIcon("vcsUncommit"), + self.tr("Undo Local Commit"), + self.__hgUncommit, + ) + self.__menus["dirMenu"] = menu + + menu = QMenu(self.menuTitle()) + menu.setIcon(EricPixmapCache.getIcon("vcsUncommit")) + menu.setTearOffEnabled(True) + menu.addAction( + EricPixmapCache.getIcon("vcsUncommit"), + self.tr("Undo Local Commit"), + self.__hgUncommit, + ) + self.__menus["dirMultiMenu"] = menu + + return self.__menus + + def menuTitle(self): + """ + Public method to get the menu title. + + @return title of the menu + @rtype str + """ + return self.tr("Uncommit") + + def showMenu(self, key, controlled): + """ + Public method to prepare the extension menu for display. + + @param key menu key (one of 'mainMenu', 'multiMenu', 'backMenu', 'dirMenu' + or 'dirMultiMenu') + @type str + @param controlled flag indicating to prepare the menu for a + version controlled entry or a non-version controlled entry + @type bool + """ + if key in self.__menus: + self.__menus[key].setEnabled(controlled) + + def __reopenProject(self, shouldReopen, title): + """ + Private method to reopen the project if needed and wanted. + + @param shouldReopen flag indicating that the project should + be reopened + @type bool + @param title title of the message box + @type str + """ + if shouldReopen: + res = EricMessageBox.yesNo( + None, + title, + self.tr("""The project should be reread. Do this now?"""), + yesDefault=True, + ) + if res: + self.project.reopenProject() + + @pyqtSlot() + def __hgUncommit(self): + """ + Private slot to undo the effect of a local commit. + """ + names = [] + for itm in self.browser.getSelectedItems(): + try: + name = itm.fileName() + except AttributeError: + name = itm.dirName() + names.append(name) + shouldReopen = self.vcs.getExtensionObject("uncommit").hgUncommit(names) + self.__reopenProject(shouldReopen, self.tr("Undo Local Commit"))
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,107 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2025 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing the uncommit extension project helper. +""" + +from PyQt6.QtCore import pyqtSlot +from PyQt6.QtWidgets import QMenu + +from eric7.EricGui import EricPixmapCache +from eric7.EricGui.EricAction import EricAction +from eric7.EricWidgets import EricMessageBox + +from ..HgExtensionProjectHelper import HgExtensionProjectHelper + + +class UncommitProjectHelper(HgExtensionProjectHelper): + """ + Class implementing the uncommit extension project helper. + """ + + def __init__(self): + """ + Constructor + """ + super().__init__() + + def initActions(self): + """ + Public method to generate the action objects. + """ + self.hgUncommitAct = EricAction( + self.tr("Undo Local Commit"), + EricPixmapCache.getIcon("vcsUncommit"), + self.tr("Undo Local Commit"), + 0, + 0, + self, + "mercurial_uncommit", + ) + self.hgUncommitAct.setStatusTip(self.tr("Undo the effect of a local commit.")) + self.hgUncommitAct.setWhatsThis( + self.tr( + """<b>Undo Local Commit</b>""" + """<p>This undoes the effect of a local commit, returning the""" + """ affected files to their uncommitted state.</p>""" + ) + ) + self.hgUncommitAct.triggered.connect(self.__hgUncommit) + self.actions.append(self.hgUncommitAct) + + def initMenu(self, mainMenu): + """ + Public method to generate the extension menu. + + @param mainMenu reference to the main menu + @type QMenu + @return populated menu + @rtype QMenu + """ + menu = QMenu(self.menuTitle(), mainMenu) + menu.setIcon(EricPixmapCache.getIcon("vcsUncommit")) + menu.setTearOffEnabled(True) + + menu.addAction(self.hgUncommitAct) + + return menu + + def menuTitle(self): + """ + Public method to get the menu title. + + @return title of the menu + @rtype str + """ + return self.tr("Uncommit") + + def __reopenProject(self, shouldReopen, title): + """ + Private method to reopen the project if needed and wanted. + + @param shouldReopen flag indicating that the project should + be reopened + @type bool + @param title title of the message box + @type str + """ + if shouldReopen: + res = EricMessageBox.yesNo( + None, + title, + self.tr("""The project should be reread. Do this now?"""), + yesDefault=True, + ) + if res: + self.project.reopenProject() + + @pyqtSlot() + def __hgUncommit(self): + """ + Private slot to undo a local commit. + """ + shouldReopen = self.vcs.getExtensionObject("uncommit").hgUncommit() + self.__reopenProject(shouldReopen, self.tr("Undo Local Commit"))
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/UncommitExtension/Ui_HgUncommitDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,108 @@ +# Form implementation generated from reading ui file 'src/eric7/Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui' +# +# Created by: PyQt6 UI code generator 6.7.1 +# +# WARNING: Any manual changes made to this file will be lost when pyuic6 is +# run again. Do not edit this file unless you know what you are doing. + + +from PyQt6 import QtCore, QtGui, QtWidgets + + +class Ui_HgUncommitDialog(object): + def setupUi(self, HgUncommitDialog): + HgUncommitDialog.setObjectName("HgUncommitDialog") + HgUncommitDialog.resize(450, 500) + HgUncommitDialog.setSizeGripEnabled(True) + self.verticalLayout_3 = QtWidgets.QVBoxLayout(HgUncommitDialog) + self.verticalLayout_3.setObjectName("verticalLayout_3") + self.logGroup = QtWidgets.QGroupBox(parent=HgUncommitDialog) + self.logGroup.setObjectName("logGroup") + self.verticalLayout = QtWidgets.QVBoxLayout(self.logGroup) + self.verticalLayout.setObjectName("verticalLayout") + self.logEdit = EricSpellCheckedTextEdit(parent=self.logGroup) + self.logEdit.setTabChangesFocus(True) + self.logEdit.setAcceptRichText(False) + self.logEdit.setObjectName("logEdit") + self.verticalLayout.addWidget(self.logEdit) + self.label = QtWidgets.QLabel(parent=self.logGroup) + self.label.setObjectName("label") + self.verticalLayout.addWidget(self.label) + self.recentComboBox = QtWidgets.QComboBox(parent=self.logGroup) + self.recentComboBox.setObjectName("recentComboBox") + self.verticalLayout.addWidget(self.recentComboBox) + self.verticalLayout_3.addWidget(self.logGroup) + self.keepCheckBox = QtWidgets.QCheckBox(parent=HgUncommitDialog) + self.keepCheckBox.setObjectName("keepCheckBox") + self.verticalLayout_3.addWidget(self.keepCheckBox) + self.allowDirtyCheckBox = QtWidgets.QCheckBox(parent=HgUncommitDialog) + self.allowDirtyCheckBox.setObjectName("allowDirtyCheckBox") + self.verticalLayout_3.addWidget(self.allowDirtyCheckBox) + self.groupBox = QtWidgets.QGroupBox(parent=HgUncommitDialog) + self.groupBox.setObjectName("groupBox") + self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.groupBox) + self.verticalLayout_2.setObjectName("verticalLayout_2") + self.label_3 = QtWidgets.QLabel(parent=self.groupBox) + self.label_3.setWordWrap(True) + self.label_3.setObjectName("label_3") + self.verticalLayout_2.addWidget(self.label_3) + self.authorComboBox = QtWidgets.QComboBox(parent=self.groupBox) + self.authorComboBox.setEditable(True) + self.authorComboBox.setObjectName("authorComboBox") + self.verticalLayout_2.addWidget(self.authorComboBox) + self.verticalLayout_3.addWidget(self.groupBox) + self.dateTimeGroup = QtWidgets.QGroupBox(parent=HgUncommitDialog) + self.dateTimeGroup.setCheckable(True) + self.dateTimeGroup.setChecked(False) + self.dateTimeGroup.setObjectName("dateTimeGroup") + self.gridLayout_2 = QtWidgets.QGridLayout(self.dateTimeGroup) + self.gridLayout_2.setObjectName("gridLayout_2") + spacerItem = QtWidgets.QSpacerItem(241, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + self.gridLayout_2.addItem(spacerItem, 0, 2, 1, 1) + self.label_4 = QtWidgets.QLabel(parent=self.dateTimeGroup) + self.label_4.setObjectName("label_4") + self.gridLayout_2.addWidget(self.label_4, 0, 0, 1, 1) + self.dateTimeEdit = QtWidgets.QDateTimeEdit(parent=self.dateTimeGroup) + self.dateTimeEdit.setDisplayFormat("yyyy-MM-dd hh:mm") + self.dateTimeEdit.setCalendarPopup(True) + self.dateTimeEdit.setObjectName("dateTimeEdit") + self.gridLayout_2.addWidget(self.dateTimeEdit, 0, 1, 1, 1) + self.verticalLayout_3.addWidget(self.dateTimeGroup) + self.buttonBox = QtWidgets.QDialogButtonBox(parent=HgUncommitDialog) + self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal) + self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok) + self.buttonBox.setObjectName("buttonBox") + self.verticalLayout_3.addWidget(self.buttonBox) + + self.retranslateUi(HgUncommitDialog) + self.buttonBox.accepted.connect(HgUncommitDialog.accept) # type: ignore + self.buttonBox.rejected.connect(HgUncommitDialog.reject) # type: ignore + QtCore.QMetaObject.connectSlotsByName(HgUncommitDialog) + HgUncommitDialog.setTabOrder(self.logEdit, self.recentComboBox) + HgUncommitDialog.setTabOrder(self.recentComboBox, self.keepCheckBox) + HgUncommitDialog.setTabOrder(self.keepCheckBox, self.allowDirtyCheckBox) + HgUncommitDialog.setTabOrder(self.allowDirtyCheckBox, self.authorComboBox) + HgUncommitDialog.setTabOrder(self.authorComboBox, self.dateTimeGroup) + HgUncommitDialog.setTabOrder(self.dateTimeGroup, self.dateTimeEdit) + + def retranslateUi(self, HgUncommitDialog): + _translate = QtCore.QCoreApplication.translate + HgUncommitDialog.setWindowTitle(_translate("HgUncommitDialog", "Undo Local Commit")) + self.logGroup.setTitle(_translate("HgUncommitDialog", "Commit Message")) + self.logEdit.setToolTip(_translate("HgUncommitDialog", "Enter the log message.")) + self.logEdit.setWhatsThis(_translate("HgUncommitDialog", "<b>Log Message</b>\n" +"<p>Enter the log message for the uncommit action.</p>")) + self.label.setText(_translate("HgUncommitDialog", "Recent commit messages")) + self.recentComboBox.setToolTip(_translate("HgUncommitDialog", "Select a recent commit message to use")) + self.keepCheckBox.setToolTip(_translate("HgUncommitDialog", "Select to allow an empty commit after undoing it.")) + self.keepCheckBox.setText(_translate("HgUncommitDialog", "Allow empty commit after undoing commit")) + self.allowDirtyCheckBox.setToolTip(_translate("HgUncommitDialog", "Select to allow undoing the commit with outstanding changes.")) + self.allowDirtyCheckBox.setText(_translate("HgUncommitDialog", "Allow undoing commit with outstanding changes")) + self.groupBox.setTitle(_translate("HgUncommitDialog", "Author")) + self.label_3.setText(_translate("HgUncommitDialog", "Enter author name to override the configured user:")) + self.authorComboBox.setToolTip(_translate("HgUncommitDialog", "Enter an author name in order to override the configured one")) + self.dateTimeGroup.setToolTip(_translate("HgUncommitDialog", "Select to give date and time information")) + self.dateTimeGroup.setTitle(_translate("HgUncommitDialog", "Date and Time")) + self.label_4.setText(_translate("HgUncommitDialog", "Date/Time:")) + self.dateTimeEdit.setToolTip(_translate("HgUncommitDialog", "Enter the date and time to be used")) +from eric7.EricWidgets.EricSpellCheckedTextEdit import EricSpellCheckedTextEdit
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/UncommitExtension/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,8 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2025 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Package implementing the uncommit extension support interface. +"""
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/UncommitExtension/uncommit.py Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,70 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2025 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing the uncommit extension interface. +""" + +from PyQt6.QtWidgets import QDialog + +from ..HgDialog import HgDialog +from ..HgExtension import HgExtension + + +class Uncommit(HgExtension): + """ + Class implementing the uncommit extension interface. + """ + + def __init__(self, vcs, ui=None): + """ + Constructor + + @param vcs reference to the Mercurial vcs object + @type Hg + @param ui reference to a UI widget (defaults to None) + @type QWidget + """ + super().__init__(vcs, ui=ui) + + def hgUncommit(self, names=None): + """ + Public method to undo the effect of a local commit. + + @param names list of file or directory paths (defaults to None) + @type list of str + @return flag indicating that the project should be reread + @rtype bool + """ + from .HgUncommitDialog import HgUncommitDialog + + res = False + dlg = HgUncommitDialog(vcs=self.vcs, parent=self.ui) + if dlg.exec() == QDialog.DialogCode.Accepted: + message, keep, dirty, author, date = dlg.getUncommitData() + + args = self.vcs.initCommand("uncommit") + if message: + args.extend(["--message", message]) + if keep: + args.append("--keep") + if dirty: + args.append("--allow-dirty-working-copy") + if author: + args.extend(["--user", author]) + if date: + args.extend(["--date", date]) + args.append("--verbose") + + if names is not None: + self.vcs.addArguments(args, names) + + dia = HgDialog(self.tr("Undo Local Commit"), hg=self.vcs, parent=self.ui) + res = dia.startProcess(args) + if res: + dia.exec() + res = dia.hasAddOrDelete() + self.vcs.checkVCSStatus() + return res
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/hg.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/hg.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -57,15 +57,16 @@ @type str """ from .CloseheadExtension.closehead import Closehead + from .FastexportExtension.fastexport import Fastexport from .GpgExtension.gpg import Gpg from .HgUtilities import getConfigPath from .HisteditExtension.histedit import Histedit from .LargefilesExtension.largefiles import Largefiles - from .PurgeExtension.purge import Purge + from .PurgeBuiltin.purge import Purge from .QueuesExtension.queues import Queues from .RebaseExtension.rebase import Rebase - from .ShelveExtension.shelve import Shelve - from .StripExtension.strip import Strip + from .ShelveBuiltin.shelve import Shelve + from .UncommitExtension.uncommit import Uncommit VersionControl.__init__(self, parent, name) self.defaultOptions = { @@ -152,17 +153,22 @@ self.__defaultPushConfigured = False self.__ignoreFile = "" + # instantiate interfaces for additional built-in functions + self.__builtins = { + "purge": Purge(self, ui=self.__ui), + "shelve": Shelve(self, ui=self.__ui), + } + # instantiate the extensions self.__extensions = { + "closehead": Closehead(self, ui=self.__ui), + "fastexport": Fastexport(self, ui=self.__ui), + "gpg": Gpg(self, ui=self.__ui), + "histedit": Histedit(self, ui=self.__ui), + "largefiles": Largefiles(self, ui=self.__ui), "mq": Queues(self, ui=self.__ui), - "purge": Purge(self, ui=self.__ui), - "gpg": Gpg(self, ui=self.__ui), "rebase": Rebase(self, ui=self.__ui), - "shelve": Shelve(self, ui=self.__ui), - "largefiles": Largefiles(self, ui=self.__ui), - "strip": Strip(self, ui=self.__ui), - "histedit": Histedit(self, ui=self.__ui), - "closehead": Closehead(self, ui=self.__ui), + "uncommit": Uncommit(self, ui=self.__ui), } def getPlugin(self): @@ -1815,12 +1821,15 @@ self.logBrowserOutgoing.raise_() self.logBrowserOutgoing.start() - def hgPull(self, revisions=None): + def hgPull(self, revisions=None, noupdate=False): """ Public method used to pull changes from a remote Mercurial repository. - @param revisions list of revisions to be pulled - @type list of str + @param revisions list of revisions to be pulled (defaults to None) + @type list of str (optional) + @param noupdate flag indicate to not update the working directory (defaults + to False) + @type bool (optional) @return flag indicating, that the update contained an add or delete @rtype bool @@ -1839,7 +1848,7 @@ args = self.initCommand(command) args.append("-v") - if self.getPlugin().getPreferences("PullUpdate"): + if self.getPlugin().getPreferences("PullUpdate") and not noupdate: args.append("--update") if command == "unbundle": args.append(self.bundleFile) @@ -3175,6 +3184,21 @@ self.__ignoreFile = ignoreFile ########################################################################### + ## Methods to handle other builtin functions are below. + ########################################################################### + + def getBuiltinObject(self, builtinName): + """ + Public method to get a reference to a builtins object. + + @param builtinName name of the builtin + @type str + @return reference to the builtin object + @rtype bool + """ + return self.__builtins[builtinName] + + ########################################################################### ## Methods to handle extensions are below. ###########################################################################
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/Config.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/Config.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2004 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2004 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/ConfigurationPage/SubversionPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/ConfigurationPage/SubversionPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/ConfigurationPage/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/ConfigurationPage/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2005 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2005 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2005 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2005 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnChangeListsDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnChangeListsDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnConst.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnConst.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnDialogMixin.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnDialogMixin.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnDiffHighlighter.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnDiffHighlighter.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnInfoDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnInfoDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnLoginDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnLoginDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnPropDelDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnPropDelDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnPropListDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnPropListDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnPropSetDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnPropSetDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnRelocateDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnRelocateDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnRepoBrowserDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnRepoBrowserDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnStatusMonitorThread.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnStatusMonitorThread.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnSwitchDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnSwitchDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnTagBranchListDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnTagBranchListDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnTagDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnTagDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnUrlSelectionDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnUrlSelectionDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnUtilities.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnUtilities.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/subversion.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/subversion.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/Config.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/Config.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2004 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2004 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/ConfigurationPage/SubversionPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/ConfigurationPage/SubversionPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/ConfigurationPage/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/ConfigurationPage/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2005 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2005 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2005 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2005 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnCommandDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnCommandDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnCommitDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnCommitDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnCopyDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnCopyDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -44,6 +44,9 @@ self.buttonBox.button(QDialogButtonBox.StandardButton.Close).setEnabled(False) self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setDefault(True) + self.errorGroup.hide() + self.inputGroup.hide() + self.process = None self.username = "" self.password = ""
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnDiffHighlighter.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnDiffHighlighter.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnPropSetDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnPropSetDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnRelocateDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnRelocateDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnRevisionSelectionDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnRevisionSelectionDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnSwitchDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnSwitchDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnTagDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnTagDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnUrlSelectionDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnUrlSelectionDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnUtilities.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnUtilities.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/subversion.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/subversion.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/ViewManagerPlugins/Listspace/Listspace.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/ViewManagerPlugins/Listspace/Listspace.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/ViewManagerPlugins/Listspace/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/ViewManagerPlugins/Listspace/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/ViewManagerPlugins/Tabview/Tabview.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/ViewManagerPlugins/Tabview/Tabview.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/ViewManagerPlugins/Tabview/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/ViewManagerPlugins/Tabview/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/ViewManagerPlugins/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/ViewManagerPlugins/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/WizardPlugins/ColorDialogWizard/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/WizardPlugins/ColorDialogWizard/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/WizardPlugins/DotDesktopWizard/DotDesktopListSelectionDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/WizardPlugins/DotDesktopWizard/DotDesktopListSelectionDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2013 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2013 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/WizardPlugins/DotDesktopWizard/DotDesktopWizardDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/WizardPlugins/DotDesktopWizard/DotDesktopWizardDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2013 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2013 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/WizardPlugins/DotDesktopWizard/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/WizardPlugins/DotDesktopWizard/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2013 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2013 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/WizardPlugins/EricMessageBoxWizard/EricMessageBoxWizardDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/WizardPlugins/EricMessageBoxWizard/EricMessageBoxWizardDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/WizardPlugins/EricMessageBoxWizard/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/WizardPlugins/EricMessageBoxWizard/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/WizardPlugins/EricPluginWizard/PluginWizardDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/WizardPlugins/EricPluginWizard/PluginWizardDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/WizardPlugins/EricPluginWizard/Templates.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/WizardPlugins/EricPluginWizard/Templates.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/WizardPlugins/EricPluginWizard/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/WizardPlugins/EricPluginWizard/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/WizardPlugins/FileDialogWizard/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/WizardPlugins/FileDialogWizard/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/WizardPlugins/FontDialogWizard/FontDialogOptionsDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/WizardPlugins/FontDialogWizard/FontDialogOptionsDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/WizardPlugins/FontDialogWizard/FontDialogWizardDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/WizardPlugins/FontDialogWizard/FontDialogWizardDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/WizardPlugins/FontDialogWizard/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/WizardPlugins/FontDialogWizard/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/WizardPlugins/InputDialogWizard/InputDialogWizardDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/WizardPlugins/InputDialogWizard/InputDialogWizardDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/WizardPlugins/InputDialogWizard/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/WizardPlugins/InputDialogWizard/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/WizardPlugins/MessageBoxWizard/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/WizardPlugins/MessageBoxWizard/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardCharactersDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardCharactersDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2004 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2004 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2004 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2004 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardRepeatDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardRepeatDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2004 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2004 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/WizardPlugins/PyRegExpWizard/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/WizardPlugins/PyRegExpWizard/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2004 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2004 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardCharactersDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardCharactersDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2013 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2013 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2013 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2013 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardRepeatDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardRepeatDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2013 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2013 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardServer.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardServer.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2013 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2013 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/WizardPlugins/QRegularExpressionWizard/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/WizardPlugins/QRegularExpressionWizard/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2013 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2013 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/WizardPlugins/SetupWizard/AddEntryPointDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/WizardPlugins/SetupWizard/AddEntryPointDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/WizardPlugins/SetupWizard/AddProjectUrlDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/WizardPlugins/SetupWizard/AddProjectUrlDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/WizardPlugins/SetupWizard/SetupCfgUtilities.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/WizardPlugins/SetupWizard/SetupCfgUtilities.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/WizardPlugins/SetupWizard/SetupWizardDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/WizardPlugins/SetupWizard/SetupWizardDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2013 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2013 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/WizardPlugins/SetupWizard/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/WizardPlugins/SetupWizard/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2013 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2013 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/WizardPlugins/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/WizardPlugins/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Plugins/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Plugins/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -802,6 +802,13 @@ None, None, ], + "networkProxyPage": [ + self.tr("Network Proxy"), + "preferences-network-proxy", + "NetworkProxyPage", + None, + None, + ], "printerPage": [ self.tr("Printer"), "preferences-printer",
--- a/src/eric7/Preferences/ConfigurationPages/ApplicationPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/ApplicationPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/CondaPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/CondaPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/ConfigurationPageBase.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/ConfigurationPageBase.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/CooperationPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/CooperationPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/DebuggerGeneralPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/DebuggerGeneralPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/DebuggerPython3Page.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/DebuggerPython3Page.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/DiffColoursPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/DiffColoursPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/EditorAPIsPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/EditorAPIsPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/EditorAutoCompletionJediPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/EditorAutoCompletionJediPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/EditorAutocompletionPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/EditorAutocompletionPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/EditorAutocompletionQScintillaPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/EditorAutocompletionQScintillaPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/EditorCallTipsJediPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/EditorCallTipsJediPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/EditorCalltipsPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/EditorCalltipsPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/EditorCalltipsQScintillaPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/EditorCalltipsQScintillaPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/EditorDocViewerPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/EditorDocViewerPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/EditorExportersPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/EditorExportersPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/EditorFilePage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/EditorFilePage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/EditorGeneralPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/EditorGeneralPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/EditorHighlightersPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/EditorHighlightersPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/EditorHighlightingStylesSelectionDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/EditorHighlightingStylesSelectionDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/EditorKeywordsPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/EditorKeywordsPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/EditorMouseClickHandlerJediPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/EditorMouseClickHandlerJediPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/EditorMouseClickHandlerPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/EditorMouseClickHandlerPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/EditorPropertiesPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/EditorPropertiesPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/EditorSearchPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/EditorSearchPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2008 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2008 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/EditorSpellCheckingPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/EditorSpellCheckingPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2008 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2008 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/EditorStylesPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/EditorStylesPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/EditorSyntaxPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/EditorSyntaxPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/EditorTypingPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/EditorTypingPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/EmailPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/EmailPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/EricServerPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/EricServerPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2024 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/GraphicsPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/GraphicsPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/HelpDocumentationPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/HelpDocumentationPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/HelpViewersPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/HelpViewersPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/HexEditorPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/HexEditorPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> #
--- a/src/eric7/Preferences/ConfigurationPages/IconsPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/IconsPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/IconsPreviewDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/IconsPreviewDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2004 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2004 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/InterfacePage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/InterfacePage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/IrcPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/IrcPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/LogViewerPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/LogViewerPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/MainPasswordEntryDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/MainPasswordEntryDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/MicroPythonPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/MicroPythonPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/MimeTypesPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/MimeTypesPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/MultiProjectPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/MultiProjectPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2008 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2008 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/NetworkPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/NetworkPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2008 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2008 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/NetworkProxyPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/NetworkProxyPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2008 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2008 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/NotificationsPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/NotificationsPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/PdfViewerPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/PdfViewerPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/PipPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/PipPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/PluginManagerPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/PluginManagerPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/PrinterPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/PrinterPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/ProjectBrowserPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/ProjectBrowserPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/ProjectPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/ProjectPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/PythonPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/PythonPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/QtPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/QtPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/SecurityPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/SecurityPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/ShellPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/ShellPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/TasksPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/TasksPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/TemplatesPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/TemplatesPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/TrayStarterPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/TrayStarterPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/Ui_WebBrowserPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/Ui_WebBrowserPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # Form implementation generated from reading ui file 'src/eric7/Preferences/ConfigurationPages/WebBrowserPage.ui' # -# Created by: PyQt6 UI code generator 6.7.0 +# Created by: PyQt6 UI code generator 6.8.0 # # WARNING: Any manual changes made to this file will be lost when pyuic6 is # run again. Do not edit this file unless you know what you are doing. @@ -219,6 +219,9 @@ self.pushServiceCheckBox = QtWidgets.QCheckBox(parent=self.privacyGroup) self.pushServiceCheckBox.setObjectName("pushServiceCheckBox") self.verticalLayout_5.addWidget(self.pushServiceCheckBox) + self.noPersistentPermissionsCheckBox = QtWidgets.QCheckBox(parent=self.privacyGroup) + self.noPersistentPermissionsCheckBox.setObjectName("noPersistentPermissionsCheckBox") + self.verticalLayout_5.addWidget(self.noPersistentPermissionsCheckBox) self.readingFromCanvasCheckBox = QtWidgets.QCheckBox(parent=self.privacyGroup) self.readingFromCanvasCheckBox.setObjectName("readingFromCanvasCheckBox") self.verticalLayout_5.addWidget(self.readingFromCanvasCheckBox) @@ -485,7 +488,8 @@ WebBrowserPage.setTabOrder(self.jsPasteCheckBox, self.pluginsGroup) WebBrowserPage.setTabOrder(self.pluginsGroup, self.pdfViewerCheckBox) WebBrowserPage.setTabOrder(self.pdfViewerCheckBox, self.pushServiceCheckBox) - WebBrowserPage.setTabOrder(self.pushServiceCheckBox, self.readingFromCanvasCheckBox) + WebBrowserPage.setTabOrder(self.pushServiceCheckBox, self.noPersistentPermissionsCheckBox) + WebBrowserPage.setTabOrder(self.noPersistentPermissionsCheckBox, self.readingFromCanvasCheckBox) WebBrowserPage.setTabOrder(self.readingFromCanvasCheckBox, self.doNotTrackCheckBox) WebBrowserPage.setTabOrder(self.doNotTrackCheckBox, self.refererSendComboBox) WebBrowserPage.setTabOrder(self.refererSendComboBox, self.refererDefaultPolicyCcomboBox) @@ -601,6 +605,8 @@ self.pushServiceCheckBox.setToolTip(_translate("WebBrowserPage", "<p>Select to enable the push messaging service.</p>\n" "<p><b>Note:</b> All push messages will go through the Google push service and its respective servers.</p>")) self.pushServiceCheckBox.setText(_translate("WebBrowserPage", "Enable Push Messaging Service")) + self.noPersistentPermissionsCheckBox.setToolTip(_translate("WebBrowserPage", "Select to store website permission settings in memory only.")) + self.noPersistentPermissionsCheckBox.setText(_translate("WebBrowserPage", "Do not persist website permissions")) self.readingFromCanvasCheckBox.setToolTip(_translate("WebBrowserPage", "<p>Select to allow reading from all canvas elements.</p>\n" "<p><b>Note:</b> Disable this option to prevent canvas fingerprinting.</p>")) self.readingFromCanvasCheckBox.setText(_translate("WebBrowserPage", "Enable Reading From Canvas"))
--- a/src/eric7/Preferences/ConfigurationPages/VcsPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/VcsPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/ViewmanagerPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/ViewmanagerPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/WebBrowserAppearancePage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/WebBrowserAppearancePage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/WebBrowserPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/WebBrowserPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -255,6 +255,13 @@ else: self.forceDarkModeCheckBox.setEnabled(False) + if qVersionTuple() >= (6, 8, 0): + self.noPersistentPermissionsCheckBox.setChecked( + Preferences.getWebBrowser("NoPersistentPermissions") + ) + else: + self.noPersistentPermissionsCheckBox.setEnabled(False) + def save(self): """ Public slot to save the Help Viewers configuration. @@ -448,6 +455,12 @@ "ForceDarkMode", self.forceDarkModeCheckBox.isChecked() ) + if self.noPersistentPermissionsCheckBox.isEnabled(): + Preferences.setWebBrowser( + "NoPersistentPermissions", + self.noPersistentPermissionsCheckBox.isChecked(), + ) + @pyqtSlot() def on_setCurrentPageButton_clicked(self): """
--- a/src/eric7/Preferences/ConfigurationPages/WebBrowserPage.ui Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/WebBrowserPage.ui Tue Jan 14 17:29:56 2025 +0100 @@ -21,13 +21,13 @@ <item> <widget class="Line" name="line17"> <property name="frameShape"> - <enum>QFrame::HLine</enum> + <enum>QFrame::Shape::HLine</enum> </property> <property name="frameShadow"> - <enum>QFrame::Sunken</enum> + <enum>QFrame::Shadow::Sunken</enum> </property> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> </widget> </item> @@ -321,7 +321,7 @@ <item row="3" column="4"> <spacer name="horizontalSpacer_2"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <property name="sizeHint" stdset="0"> <size> @@ -383,7 +383,7 @@ <string>Enter the time to save sessions</string> </property> <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set> </property> <property name="suffix"> <string> s</string> @@ -402,7 +402,7 @@ <item row="1" column="2"> <spacer name="horizontalSpacer_8"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <property name="sizeHint" stdset="0"> <size> @@ -488,7 +488,7 @@ <item> <spacer name="horizontalSpacer_9"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <property name="sizeHint" stdset="0"> <size> @@ -599,6 +599,16 @@ </widget> </item> <item> + <widget class="QCheckBox" name="noPersistentPermissionsCheckBox"> + <property name="toolTip"> + <string>Select to store website permission settings in memory only.</string> + </property> + <property name="text"> + <string>Do not persist website permissions</string> + </property> + </widget> + </item> + <item> <widget class="QCheckBox" name="readingFromCanvasCheckBox"> <property name="toolTip"> <string><p>Select to allow reading from all canvas elements.</p> @@ -763,7 +773,7 @@ <item> <spacer name="horizontalSpacer_6"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <property name="sizeHint" stdset="0"> <size> @@ -924,7 +934,7 @@ <string>Enter the maximum size of the disk cache</string> </property> <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set> </property> <property name="suffix"> <string> MB</string> @@ -940,7 +950,7 @@ <item row="1" column="2"> <spacer name="horizontalSpacer"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <property name="sizeHint" stdset="0"> <size> @@ -991,7 +1001,7 @@ <item> <spacer name="horizontalSpacer_10"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <property name="sizeHint" stdset="0"> <size> @@ -1042,7 +1052,7 @@ <item> <spacer name="horizontalSpacer_11"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <property name="sizeHint" stdset="0"> <size> @@ -1074,14 +1084,14 @@ <string>Select the language to be used for web searches</string> </property> <property name="sizeAdjustPolicy"> - <enum>QComboBox::AdjustToContents</enum> + <enum>QComboBox::SizeAdjustPolicy::AdjustToContents</enum> </property> </widget> </item> <item> <spacer name="horizontalSpacer_3"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <property name="sizeHint" stdset="0"> <size> @@ -1117,7 +1127,7 @@ <item> <spacer name="horizontalSpacer_5"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <property name="sizeHint" stdset="0"> <size> @@ -1233,7 +1243,7 @@ <string>Enter the auto-scroll divider value</string> </property> <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set> </property> <property name="decimals"> <number>1</number> @@ -1249,7 +1259,7 @@ <item> <spacer name="horizontalSpacer_7"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <property name="sizeHint" stdset="0"> <size> @@ -1312,6 +1322,7 @@ <tabstop>pluginsGroup</tabstop> <tabstop>pdfViewerCheckBox</tabstop> <tabstop>pushServiceCheckBox</tabstop> + <tabstop>noPersistentPermissionsCheckBox</tabstop> <tabstop>readingFromCanvasCheckBox</tabstop> <tabstop>doNotTrackCheckBox</tabstop> <tabstop>refererSendComboBox</tabstop>
--- a/src/eric7/Preferences/ConfigurationPages/WebBrowserSpellCheckingPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/WebBrowserSpellCheckingPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/WebBrowserVirusTotalPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/WebBrowserVirusTotalPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ConfigurationPages/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/HighlightingStylesFile.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/HighlightingStylesFile.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/MouseClickDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/MouseClickDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/PreferencesLexer.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/PreferencesLexer.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ProgramsDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ProgramsDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -267,7 +267,9 @@ # 5. do the pip program(s) virtualenvManager = ericApp().getObject("VirtualEnvManager") - for venvName in virtualenvManager.getVirtualenvNames(noServer=True): + for venvName in virtualenvManager.getVirtualenvNames( + noRemote=True, noServer=True + ): interpreter = virtualenvManager.getVirtualenvInterpreter(venvName) self.__createProgramEntry( self.tr("PyPI Package Management"),
--- a/src/eric7/Preferences/ShortcutDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ShortcutDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/Shortcuts.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/Shortcuts.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2004 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2004 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ShortcutsDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ShortcutsDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ShortcutsFile.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ShortcutsFile.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/SubstyleDefinitionDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/SubstyleDefinitionDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ThemeManager.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ThemeManager.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ToolConfigurationDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ToolConfigurationDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ToolGroupConfigurationDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ToolGroupConfigurationDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/ViewProfileDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/ViewProfileDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Preferences/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Preferences/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -1184,6 +1184,8 @@ "SafeBrowsingUseLookupApi": False, # Push Messaging "PushServiceEnabled": False, + # Persistent Permissions + "NoPersistentPermissions": False, } @classmethod @@ -2229,7 +2231,7 @@ "SingleApplicationMode", "TabViewManagerFilenameOnly", "ShowFilePreview", - "ShowFilePreviewJS", + "ShowFilePreviewSSI", "CaptionShowsFilename", "ShowSplash", "SplitOrientationVertical", @@ -3313,6 +3315,7 @@ "NavigateOnDropEnabled", "ReadingFromCanvasEnabled", "ForceDarkMode", + "NoPersistentPermissions", ]: return EricUtilities.toBool( Prefs.settings.value("WebBrowser/" + key, Prefs.webBrowserDefaults[key])
--- a/src/eric7/Project/AddDirectoryDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Project/AddDirectoryDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Project/AddFileDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Project/AddFileDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Project/AddFoundFilesDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Project/AddFoundFilesDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Project/AddLanguageDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Project/AddLanguageDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Project/CreateDialogCodeDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Project/CreateDialogCodeDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Project/DebuggerPropertiesDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Project/DebuggerPropertiesDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2005 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2005 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Project/DebuggerPropertiesFile.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Project/DebuggerPropertiesFile.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Project/FileCategoryRepositoryItem.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Project/FileCategoryRepositoryItem.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Project/FiletypeAssociationDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Project/FiletypeAssociationDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2005 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2005 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Project/LexerAssociationDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Project/LexerAssociationDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Project/MakePropertiesDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Project/MakePropertiesDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2018 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2018 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Project/NewDialogClassDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Project/NewDialogClassDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Project/NewDirectoryDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Project/NewDirectoryDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2024 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Project/NewPythonPackageDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Project/NewPythonPackageDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Project/Project.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Project/Project.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Project/ProjectBaseBrowser.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Project/ProjectBaseBrowser.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Project/ProjectBrowser.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Project/ProjectBrowser.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Project/ProjectBrowserModel.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Project/ProjectBrowserModel.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Project/ProjectBrowserRepositoryItem.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Project/ProjectBrowserRepositoryItem.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Project/ProjectBrowserSortFilterProxyModel.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Project/ProjectBrowserSortFilterProxyModel.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Project/ProjectFile.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Project/ProjectFile.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Project/ProjectFormsBrowser.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Project/ProjectFormsBrowser.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Project/ProjectOthersBrowser.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Project/ProjectOthersBrowser.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Project/ProjectResourcesBrowser.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Project/ProjectResourcesBrowser.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Project/ProjectSourcesBrowser.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Project/ProjectSourcesBrowser.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Project/ProjectTranslationsBrowser.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Project/ProjectTranslationsBrowser.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Project/ProjectVenvConfigurationDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Project/ProjectVenvConfigurationDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Project/ProjectVenvCreationParametersDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Project/ProjectVenvCreationParametersDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Project/PropertiesDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Project/PropertiesDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -225,7 +225,13 @@ self.__initFileTypesDict(force=True) self.languageComboBox.currentTextChanged.connect(self.__initFileTypesDict) - self.mixedLanguageCheckBox.stateChanged.connect(self.__initFileTypesDict) + try: + self.mixedLanguageCheckBox.checkStateChanged.connect( + self.__initFileTypesDict + ) + except AttributeError: + # backward compatibility for Qt < 6.7 + self.mixedLanguageCheckBox.stateChanged.connect(self.__initFileTypesDict) self.projectTypeComboBox.currentIndexChanged.connect(self.__initFileTypesDict) self.__updateOk()
--- a/src/eric7/Project/QuickFindFileDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Project/QuickFindFileDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2004 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2004 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Project/RccCompilerOptionsDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Project/RccCompilerOptionsDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2018 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2018 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Project/SpellingPropertiesDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Project/SpellingPropertiesDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2008 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2008 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Project/TranslationPropertiesDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Project/TranslationPropertiesDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Project/UicCompilerOptionsDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Project/UicCompilerOptionsDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2018 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2018 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Project/UicLoadUi5.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Project/UicLoadUi5.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Project/UicLoadUi6.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Project/UicLoadUi6.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Project/UserProjectFile.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Project/UserProjectFile.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Project/UserPropertiesDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Project/UserPropertiesDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Project/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Project/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/APIsManager.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/APIsManager.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/DocstringGenerator/BaseDocstringGenerator.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/DocstringGenerator/BaseDocstringGenerator.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/DocstringGenerator/EricdocGenerator.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/DocstringGenerator/EricdocGenerator.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/DocstringGenerator/GoogledocGenerator.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/DocstringGenerator/GoogledocGenerator.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/DocstringGenerator/NumpydocGenerator.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/DocstringGenerator/NumpydocGenerator.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/DocstringGenerator/PyDocstringGenerator.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/DocstringGenerator/PyDocstringGenerator.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/DocstringGenerator/SphinxdocGenerator.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/DocstringGenerator/SphinxdocGenerator.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/DocstringGenerator/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/DocstringGenerator/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Editor.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Editor.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/EditorAssembly.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/EditorAssembly.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/EditorButtonsWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/EditorButtonsWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/EditorMarkerMap.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/EditorMarkerMap.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/EditorOutline.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/EditorOutline.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/EditorOutlineModel.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/EditorOutlineModel.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/EditorOutlineSizesDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/EditorOutlineSizesDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Exporters/ExporterBase.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Exporters/ExporterBase.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Exporters/ExporterHTML.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Exporters/ExporterHTML.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Exporters/ExporterODT.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Exporters/ExporterODT.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Exporters/ExporterPDF.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Exporters/ExporterPDF.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Exporters/ExporterRTF.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Exporters/ExporterRTF.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Exporters/ExporterTEX.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Exporters/ExporterTEX.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Exporters/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Exporters/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/GotoDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/GotoDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/KeySequenceTranslator.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/KeySequenceTranslator.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Lexers/Lexer.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Lexers/Lexer.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Lexers/LexerBash.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Lexers/LexerBash.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2004 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2004 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Lexers/LexerBatch.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Lexers/LexerBatch.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2005 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2005 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Lexers/LexerCMake.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Lexers/LexerCMake.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Lexers/LexerCPP.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Lexers/LexerCPP.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Lexers/LexerCSS.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Lexers/LexerCSS.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2005 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2005 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Lexers/LexerCSharp.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Lexers/LexerCSharp.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Lexers/LexerCoffeeScript.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Lexers/LexerCoffeeScript.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Lexers/LexerContainer.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Lexers/LexerContainer.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2008 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2008 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Lexers/LexerD.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Lexers/LexerD.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Lexers/LexerDiff.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Lexers/LexerDiff.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2005 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2005 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Lexers/LexerFortran.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Lexers/LexerFortran.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2008 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2008 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Lexers/LexerFortran77.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Lexers/LexerFortran77.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2008 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2008 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Lexers/LexerHTML.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Lexers/LexerHTML.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Lexers/LexerJSON.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Lexers/LexerJSON.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Lexers/LexerJava.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Lexers/LexerJava.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Lexers/LexerJavaScript.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Lexers/LexerJavaScript.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Lexers/LexerLua.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Lexers/LexerLua.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2005 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2005 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Lexers/LexerMakefile.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Lexers/LexerMakefile.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2005 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2005 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Lexers/LexerMarkdown.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Lexers/LexerMarkdown.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Lexers/LexerMatlab.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Lexers/LexerMatlab.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Lexers/LexerOctave.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Lexers/LexerOctave.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Lexers/LexerPO.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Lexers/LexerPO.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Lexers/LexerPOV.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Lexers/LexerPOV.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Lexers/LexerPascal.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Lexers/LexerPascal.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2008 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2008 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Lexers/LexerPerl.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Lexers/LexerPerl.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2004 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2004 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Lexers/LexerPostScript.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Lexers/LexerPostScript.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2008 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2008 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Lexers/LexerProperties.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Lexers/LexerProperties.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2005 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2005 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Lexers/LexerPygments.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Lexers/LexerPygments.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2008 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2008 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Lexers/LexerPython.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Lexers/LexerPython.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Lexers/LexerQSS.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Lexers/LexerQSS.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2005 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2005 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Lexers/LexerRuby.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Lexers/LexerRuby.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2005 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2005 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Lexers/LexerSQL.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Lexers/LexerSQL.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Lexers/LexerTCL.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Lexers/LexerTCL.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2008 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2008 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Lexers/LexerTeX.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Lexers/LexerTeX.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2005 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2005 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Lexers/LexerVHDL.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Lexers/LexerVHDL.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Lexers/LexerXML.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Lexers/LexerXML.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2008 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2008 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Lexers/LexerYAML.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Lexers/LexerYAML.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2008 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2008 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Lexers/SubstyledLexer.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Lexers/SubstyledLexer.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Lexers/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Lexers/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/MarkupProviders/HtmlProvider.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/MarkupProviders/HtmlProvider.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/MarkupProviders/HyperlinkMarkupDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/MarkupProviders/HyperlinkMarkupDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/MarkupProviders/ImageMarkupDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/MarkupProviders/ImageMarkupDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/MarkupProviders/MarkdownProvider.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/MarkupProviders/MarkdownProvider.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/MarkupProviders/MarkupBase.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/MarkupProviders/MarkupBase.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/MarkupProviders/RestructuredTextProvider.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/MarkupProviders/RestructuredTextProvider.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/MarkupProviders/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/MarkupProviders/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/MiniEditor.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/MiniEditor.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Printer.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Printer.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/QsciScintillaCompat.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/QsciScintillaCompat.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2004 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2004 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/SearchReplaceWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/SearchReplaceWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2008 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2008 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/Shell.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/Shell.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/ShellHistoryDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/ShellHistoryDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2008 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2008 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/ShellWindow.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/ShellWindow.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/SortOptionsDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/SortOptionsDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2013 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2013 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/SpellChecker.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/SpellChecker.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2008 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2008 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/SpellCheckingDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/SpellCheckingDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2008 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2008 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/SpellingDictionaryEditDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/SpellingDictionaryEditDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/TypingCompleters/CompleterBase.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/TypingCompleters/CompleterBase.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/TypingCompleters/CompleterPython.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/TypingCompleters/CompleterPython.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/TypingCompleters/CompleterRuby.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/TypingCompleters/CompleterRuby.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/TypingCompleters/CompleterToml.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/TypingCompleters/CompleterToml.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/TypingCompleters/CompleterYaml.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/TypingCompleters/CompleterYaml.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/TypingCompleters/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/TypingCompleters/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/ZoomDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/ZoomDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QScintilla/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QScintilla/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QtHelpInterface/HelpDocsInstaller.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QtHelpInterface/HelpDocsInstaller.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QtHelpInterface/HelpIndexWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QtHelpInterface/HelpIndexWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QtHelpInterface/HelpSearchWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QtHelpInterface/HelpSearchWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QtHelpInterface/HelpTocWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QtHelpInterface/HelpTocWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QtHelpInterface/HelpTopicDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QtHelpInterface/HelpTopicDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QtHelpInterface/QtHelpDocumentationConfigurationDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QtHelpInterface/QtHelpDocumentationConfigurationDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QtHelpInterface/QtHelpDocumentationSelectionDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QtHelpInterface/QtHelpDocumentationSelectionDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QtHelpInterface/QtHelpDocumentationSettings.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QtHelpInterface/QtHelpDocumentationSettings.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QtHelpInterface/QtHelpDocumentationSettingsWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QtHelpInterface/QtHelpDocumentationSettingsWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QtHelpInterface/QtHelpSchemeHandler.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QtHelpInterface/QtHelpSchemeHandler.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/QtHelpInterface/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/QtHelpInterface/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/RemoteServer/EricRequestCategory.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/RemoteServer/EricRequestCategory.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2024 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/RemoteServer/EricServer.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/RemoteServer/EricServer.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2024 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/RemoteServer/EricServerBaseRequestHandler.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/RemoteServer/EricServerBaseRequestHandler.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2024 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/RemoteServer/EricServerCoverageRequestHandler.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/RemoteServer/EricServerCoverageRequestHandler.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2024 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/RemoteServer/EricServerDebuggerRequestHandler.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/RemoteServer/EricServerDebuggerRequestHandler.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2024 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/RemoteServer/EricServerEditorConfigRequestHandler.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/RemoteServer/EricServerEditorConfigRequestHandler.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2024 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/RemoteServer/EricServerFileSystemRequestHandler.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/RemoteServer/EricServerFileSystemRequestHandler.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2024 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/RemoteServer/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/RemoteServer/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2024 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/RemoteServerInterface/EricServerConnectionDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/RemoteServerInterface/EricServerConnectionDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2024 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> #
--- a/src/eric7/RemoteServerInterface/EricServerCoverageInterface.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/RemoteServerInterface/EricServerCoverageInterface.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2024 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/RemoteServerInterface/EricServerDebuggerInterface.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/RemoteServerInterface/EricServerDebuggerInterface.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2024 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/RemoteServerInterface/EricServerEditorConfigInterface.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/RemoteServerInterface/EricServerEditorConfigInterface.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2024 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/RemoteServerInterface/EricServerFileDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/RemoteServerInterface/EricServerFileDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2024 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/RemoteServerInterface/EricServerFileSystemInterface.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/RemoteServerInterface/EricServerFileSystemInterface.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2024 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/RemoteServerInterface/EricServerInterface.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/RemoteServerInterface/EricServerInterface.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2024 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/RemoteServerInterface/EricServerProfilesDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/RemoteServerInterface/EricServerProfilesDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2024 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/RemoteServerInterface/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/RemoteServerInterface/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2024 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Sessions/SessionFile.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Sessions/SessionFile.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Sessions/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Sessions/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Snapshot/SnapWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Snapshot/SnapWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Snapshot/SnapshotDefaultGrabber.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Snapshot/SnapshotDefaultGrabber.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Snapshot/SnapshotFreehandGrabber.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Snapshot/SnapshotFreehandGrabber.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Snapshot/SnapshotModes.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Snapshot/SnapshotModes.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Snapshot/SnapshotPreview.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Snapshot/SnapshotPreview.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Snapshot/SnapshotRegionGrabber.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Snapshot/SnapshotRegionGrabber.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Snapshot/SnapshotTimer.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Snapshot/SnapshotTimer.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Snapshot/SnapshotWaylandGrabber.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Snapshot/SnapshotWaylandGrabber.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Snapshot/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Snapshot/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/SqlBrowser/SqlBrowser.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/SqlBrowser/SqlBrowser.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/SqlBrowser/SqlBrowserWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/SqlBrowser/SqlBrowserWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/SqlBrowser/SqlConnectionDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/SqlBrowser/SqlConnectionDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/SqlBrowser/SqlConnectionWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/SqlBrowser/SqlConnectionWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/SqlBrowser/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/SqlBrowser/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/SystemUtilities/DesktopUtilities.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/SystemUtilities/DesktopUtilities.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/SystemUtilities/FileSystemUtilities.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/SystemUtilities/FileSystemUtilities.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/SystemUtilities/OSUtilities.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/SystemUtilities/OSUtilities.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/SystemUtilities/PySideImporter.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/SystemUtilities/PySideImporter.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/SystemUtilities/PythonUtilities.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/SystemUtilities/PythonUtilities.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/SystemUtilities/QtUtilities.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/SystemUtilities/QtUtilities.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/SystemUtilities/SysUtilities.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/SystemUtilities/SysUtilities.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/SystemUtilities/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/SystemUtilities/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Tasks/Task.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Tasks/Task.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2005 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2005 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Tasks/TaskFilter.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Tasks/TaskFilter.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2005 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2005 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Tasks/TaskFilterConfigDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Tasks/TaskFilterConfigDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Tasks/TaskPropertiesDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Tasks/TaskPropertiesDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2005 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2005 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Tasks/TaskViewer.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Tasks/TaskViewer.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2005 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2005 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Tasks/TasksFile.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Tasks/TasksFile.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Tasks/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Tasks/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Templates/TemplateMultipleVariablesDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Templates/TemplateMultipleVariablesDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2005 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2005 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Templates/TemplatePropertiesDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Templates/TemplatePropertiesDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2005 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2005 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Templates/TemplateSingleVariableDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Templates/TemplateSingleVariableDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2005 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2005 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Templates/TemplateViewer.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Templates/TemplateViewer.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2005 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2005 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Templates/TemplatesFile.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Templates/TemplatesFile.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Templates/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Templates/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Testing/Interfaces/PytestExecutor.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Testing/Interfaces/PytestExecutor.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Testing/Interfaces/PytestRunner.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Testing/Interfaces/PytestRunner.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Testing/Interfaces/TestExecutorBase.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Testing/Interfaces/TestExecutorBase.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Testing/Interfaces/TestFrameworkRegistry.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Testing/Interfaces/TestFrameworkRegistry.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Testing/Interfaces/UnittestExecutor.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Testing/Interfaces/UnittestExecutor.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Testing/Interfaces/UnittestRunner.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Testing/Interfaces/UnittestRunner.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Testing/Interfaces/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Testing/Interfaces/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Testing/MarkersWindow.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Testing/MarkersWindow.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Testing/TestResultsTree.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Testing/TestResultsTree.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Testing/TestingWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Testing/TestingWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Testing/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Testing/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Toolbox/SingleApplication.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Toolbox/SingleApplication.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2004 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2004 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Toolbox/Startup.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Toolbox/Startup.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Toolbox/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Toolbox/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Tools/TRPreviewer.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Tools/TRPreviewer.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2004 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2004 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Tools/TRSingleApplication.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Tools/TRSingleApplication.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2004 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2004 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Tools/TrayStarter.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Tools/TrayStarter.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Tools/UIPreviewer.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Tools/UIPreviewer.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2004 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2004 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Tools/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Tools/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2004 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2004 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Tools/webBrowserSupport.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Tools/webBrowserSupport.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (c) 2018 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2018 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/UI/Browser.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/UI/Browser.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/UI/BrowserModel.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/UI/BrowserModel.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/UI/BrowserSortFilterProxyModel.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/UI/BrowserSortFilterProxyModel.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/UI/ClearPrivateDataDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/UI/ClearPrivateDataDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/UI/CodeDocumentationViewer.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/UI/CodeDocumentationViewer.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/UI/CodeDocumentationViewerTemplate.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/UI/CodeDocumentationViewerTemplate.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/UI/CompareDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/UI/CompareDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2004 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2004 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/UI/DeleteFilesConfirmationDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/UI/DeleteFilesConfirmationDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2004 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2004 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/UI/DiffDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/UI/DiffDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2004 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2004 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/UI/DiffHighlighter.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/UI/DiffHighlighter.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/UI/EmailDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/UI/EmailDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/UI/ErrorLogDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/UI/ErrorLogDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/UI/FindFileFilterPropertiesDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/UI/FindFileFilterPropertiesDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2024 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/UI/FindFileFiltersEditDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/UI/FindFileFiltersEditDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2024 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/UI/FindFileWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/UI/FindFileWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -711,7 +711,6 @@ files = self.__getFileList( os.path.abspath(self.dirPicker.currentText()), filterRe, - None, excludeHiddenDirs=self.excludeHiddenCheckBox.isChecked(), excludeHiddenFiles=self.excludeHiddenCheckBox.isChecked(), )
--- a/src/eric7/UI/FindLocationWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/UI/FindLocationWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2004 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2004 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/UI/Info.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/UI/Info.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -9,8 +9,8 @@ Program = "eric7" -Copyright = "Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de>" -CopyrightShort = "(c) 2002 - 2024 Detlev Offenbach" +Copyright = "Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de>" +CopyrightShort = "(c) 2002 - 2025 Detlev Offenbach" BugAddress = "eric-bugs@eric-ide.python-projects.org" FeatureAddress = "eric-featurerequest@eric-ide.python-projects.org" Homepage = "https://eric-ide.python-projects.org/index.html"
--- a/src/eric7/UI/InstallInfoDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/UI/InstallInfoDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/UI/LogView.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/UI/LogView.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/UI/NotificationWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/UI/NotificationWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/UI/NumbersWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/UI/NumbersWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/UI/Previewer.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/UI/Previewer.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2013 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2013 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/UI/Previewers/MarkdownExtensions.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/UI/Previewers/MarkdownExtensions.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/UI/Previewers/PreviewerHTML.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/UI/Previewers/PreviewerHTML.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/UI/Previewers/PreviewerHTMLStyles.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/UI/Previewers/PreviewerHTMLStyles.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/UI/Previewers/PreviewerQSS.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/UI/Previewers/PreviewerQSS.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/UI/Previewers/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/UI/Previewers/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/UI/PythonAstViewer.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/UI/PythonAstViewer.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/UI/PythonDisViewer.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/UI/PythonDisViewer.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/UI/SearchWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/UI/SearchWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/UI/SplashScreen.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/UI/SplashScreen.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/UI/SymbolsWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/UI/SymbolsWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/UI/UserInterface.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/UI/UserInterface.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -6715,7 +6715,7 @@ @param tool dictionary of tool entries @type dict """ - proc = QProcess() + proc = QProcess(self) procData = (None,) program = tool["executable"] args = [] @@ -6815,11 +6815,12 @@ toolProcData[0].replace(text) toolProcData[0].endUndoAction() - # now delete the exited procs from the list of running processes + # now delete the exited processes from the list of running processes for proc in exitedProcs: self.toolProcs.remove(proc) t = self.tr("Process '{0}' has exited.\n").format(proc[0]) self.appendToStdout(t) + proc.deleteLater() def __showPythonDoc(self): """
--- a/src/eric7/UI/VersionsDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/UI/VersionsDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/UI/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/UI/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/UI/data/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/UI/data/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/UI/upgrader.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/UI/upgrader.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Utilities/AutoSaver.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Utilities/AutoSaver.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Utilities/BackgroundClient.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Utilities/BackgroundClient.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2013 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2013 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # # pylint: disable=C0103
--- a/src/eric7/Utilities/BackgroundService.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Utilities/BackgroundService.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2013 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2013 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Utilities/ClassBrowsers/ClbrBaseClasses.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Utilities/ClassBrowsers/ClbrBaseClasses.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2005 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2005 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Utilities/ClassBrowsers/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Utilities/ClassBrowsers/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2005 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2005 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Utilities/ClassBrowsers/pyclbr.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Utilities/ClassBrowsers/pyclbr.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2005 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2005 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Utilities/ClassBrowsers/rbclbr.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Utilities/ClassBrowsers/rbclbr.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2005 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2005 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Utilities/FtpUtilities.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Utilities/FtpUtilities.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Utilities/GetSysPath.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Utilities/GetSysPath.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Utilities/MimeTypes.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Utilities/MimeTypes.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Utilities/ModuleParser.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Utilities/ModuleParser.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Utilities/MouseUtilities.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Utilities/MouseUtilities.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Utilities/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Utilities/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/Utilities/uic.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/Utilities/uic.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/VCS/CommandOptionsDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/VCS/CommandOptionsDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/VCS/ProjectBrowserHelper.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/VCS/ProjectBrowserHelper.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2005 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2005 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/VCS/ProjectHelper.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/VCS/ProjectHelper.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2005 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2005 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/VCS/RepositoryInfoDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/VCS/RepositoryInfoDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2004 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2004 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/VCS/StatusMonitorLed.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/VCS/StatusMonitorLed.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/VCS/StatusMonitorThread.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/VCS/StatusMonitorThread.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/VCS/StatusWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/VCS/StatusWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/VCS/VersionControl.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/VCS/VersionControl.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/VCS/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/VCS/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/ViewManager/BookmarkedFilesDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/ViewManager/BookmarkedFilesDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2004 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2004 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/ViewManager/ViewManager.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/ViewManager/ViewManager.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/ViewManager/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/ViewManager/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2005 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2005 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/VirtualEnv/VirtualenvAddEditDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/VirtualEnv/VirtualenvAddEditDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2018 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2018 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/VirtualEnv/VirtualenvConfigurationDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/VirtualEnv/VirtualenvConfigurationDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -17,7 +17,7 @@ from eric7 import CondaInterface, Preferences from eric7.EricWidgets.EricApplication import ericApp from eric7.EricWidgets.EricPathPicker import EricPathPickerModes -from eric7.SystemUtilities import FileSystemUtilities, OSUtilities, PythonUtilities +from eric7.SystemUtilities import PythonUtilities from .Ui_VirtualenvConfigurationDialog import Ui_VirtualenvConfigurationDialog @@ -41,7 +41,7 @@ self.setupUi(self) if not baseDir: - baseDir = OSUtilities.getHomeDir() + baseDir = os.path.expanduser("~") self.__envBaseDir = baseDir self.targetDirectoryPicker.setMode(EricPathPickerModes.DIRECTORY_MODE) @@ -55,7 +55,7 @@ self.extraSearchPathPicker.setWindowTitle( self.tr("Extra Search Path for setuptools/pip") ) - self.extraSearchPathPicker.setDefaultDirectory(OSUtilities.getHomeDir()) + self.extraSearchPathPicker.setDefaultDirectory(os.path.expanduser("~")) self.pythonExecPicker.setMode(EricPathPickerModes.OPEN_FILE_MODE) self.pythonExecPicker.setWindowTitle(self.tr("Python Interpreter")) @@ -65,19 +65,19 @@ self.condaTargetDirectoryPicker.setWindowTitle( self.tr("Conda Environment Location") ) - self.condaTargetDirectoryPicker.setDefaultDirectory(OSUtilities.getHomeDir()) + self.condaTargetDirectoryPicker.setDefaultDirectory(os.path.expanduser("~")) self.condaCloneDirectoryPicker.setMode(EricPathPickerModes.DIRECTORY_MODE) self.condaCloneDirectoryPicker.setWindowTitle( self.tr("Conda Environment Location") ) - self.condaCloneDirectoryPicker.setDefaultDirectory(OSUtilities.getHomeDir()) + self.condaCloneDirectoryPicker.setDefaultDirectory(os.path.expanduser("~")) self.condaRequirementsFilePicker.setMode(EricPathPickerModes.OPEN_FILE_MODE) self.condaRequirementsFilePicker.setWindowTitle( self.tr("Conda Requirements File") ) - self.condaRequirementsFilePicker.setDefaultDirectory(OSUtilities.getHomeDir()) + self.condaRequirementsFilePicker.setDefaultDirectory(os.path.expanduser("~")) self.condaRequirementsFilePicker.setFilters( self.tr("Text Files (*.txt);;All Files (*)") ) @@ -450,9 +450,7 @@ @return target directory path @rtype str """ - targetDirectory = FileSystemUtilities.toNativeSeparators( - self.targetDirectoryPicker.text() - ) + targetDirectory = self.targetDirectoryPicker.text() if not os.path.isabs(targetDirectory): targetDirectory = os.path.join(os.path.expanduser("~"), targetDirectory) return targetDirectory @@ -492,9 +490,7 @@ if self.extraSearchPathPicker.text(): args.append( "--extra-search-dir={0}".format( - FileSystemUtilities.toNativeSeparators( - self.extraSearchPathPicker.text() - ) + self.extraSearchPathPicker.text() ) ) if self.promptPrefixEdit.text(): @@ -504,13 +500,7 @@ ) ) if self.pythonExecPicker.text(): - args.append( - "--python={0}".format( - FileSystemUtilities.toNativeSeparators( - self.pythonExecPicker.text() - ) - ) - ) + args.append("--python={0}".format(self.pythonExecPicker.text())) elif self.versionComboBox.currentText(): args.append( "--python=python{0}".format(self.versionComboBox.currentText()) @@ -589,9 +579,7 @@ "createLog": self.logCheckBox.isChecked(), "createScript": self.scriptCheckBox.isChecked(), "targetDirectory": self.__generateTargetDir(), - "pythonExe": FileSystemUtilities.toNativeSeparators( - self.pythonExecPicker.text() - ), + "pythonExe": self.pythonExecPicker.text(), } )
--- a/src/eric7/VirtualEnv/VirtualenvExecDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/VirtualEnv/VirtualenvExecDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2014 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2014 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/VirtualEnv/VirtualenvInterpreterSelectionDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/VirtualEnv/VirtualenvInterpreterSelectionDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2018 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2018 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/VirtualEnv/VirtualenvManager.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/VirtualEnv/VirtualenvManager.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2018 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2018 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/VirtualEnv/VirtualenvManagerWidgets.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/VirtualEnv/VirtualenvManagerWidgets.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2018 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2018 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/VirtualEnv/VirtualenvMeta.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/VirtualEnv/VirtualenvMeta.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/VirtualEnv/VirtualenvNameDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/VirtualEnv/VirtualenvNameDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/VirtualEnv/VirtualenvUpgradeConfigurationDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/VirtualEnv/VirtualenvUpgradeConfigurationDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/VirtualEnv/VirtualenvUpgradeExecDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/VirtualEnv/VirtualenvUpgradeExecDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/VirtualEnv/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/VirtualEnv/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2018 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2018 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/AdBlock/AdBlockDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/AdBlock/AdBlockDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/AdBlock/AdBlockExceptionsDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/AdBlock/AdBlockExceptionsDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/AdBlock/AdBlockIcon.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/AdBlock/AdBlockIcon.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/AdBlock/AdBlockManager.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/AdBlock/AdBlockManager.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/AdBlock/AdBlockMatcher.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/AdBlock/AdBlockMatcher.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/AdBlock/AdBlockPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/AdBlock/AdBlockPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/AdBlock/AdBlockRule.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/AdBlock/AdBlockRule.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/AdBlock/AdBlockSearchTree.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/AdBlock/AdBlockSearchTree.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/AdBlock/AdBlockSubscription.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/AdBlock/AdBlockSubscription.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/AdBlock/AdBlockTreeWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/AdBlock/AdBlockTreeWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/AdBlock/AdBlockUrlInterceptor.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/AdBlock/AdBlockUrlInterceptor.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/AdBlock/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/AdBlock/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/AutoScroll/AutoScroller.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/AutoScroll/AutoScroller.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/AutoScroll/FrameScroller.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/AutoScroll/FrameScroller.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/AutoScroll/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/AutoScroll/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Bookmarks/AddBookmarkDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Bookmarks/AddBookmarkDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Bookmarks/BookmarkNode.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Bookmarks/BookmarkNode.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Bookmarks/BookmarkPropertiesDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Bookmarks/BookmarkPropertiesDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Bookmarks/BookmarksDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Bookmarks/BookmarksDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Bookmarks/BookmarksImportDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Bookmarks/BookmarksImportDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Bookmarks/BookmarksImporters/BookmarksImporter.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Bookmarks/BookmarksImporters/BookmarksImporter.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Bookmarks/BookmarksImporters/ChromeImporter.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Bookmarks/BookmarksImporters/ChromeImporter.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Bookmarks/BookmarksImporters/FirefoxImporter.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Bookmarks/BookmarksImporters/FirefoxImporter.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Bookmarks/BookmarksImporters/HtmlImporter.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Bookmarks/BookmarksImporters/HtmlImporter.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Bookmarks/BookmarksImporters/IExplorerImporter.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Bookmarks/BookmarksImporters/IExplorerImporter.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Bookmarks/BookmarksImporters/OperaImporter.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Bookmarks/BookmarksImporters/OperaImporter.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Bookmarks/BookmarksImporters/SafariImporter.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Bookmarks/BookmarksImporters/SafariImporter.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Bookmarks/BookmarksImporters/XbelImporter.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Bookmarks/BookmarksImporters/XbelImporter.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Bookmarks/BookmarksImporters/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Bookmarks/BookmarksImporters/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Bookmarks/BookmarksManager.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Bookmarks/BookmarksManager.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Bookmarks/BookmarksMenu.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Bookmarks/BookmarksMenu.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Bookmarks/BookmarksModel.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Bookmarks/BookmarksModel.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Bookmarks/BookmarksToolBar.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Bookmarks/BookmarksToolBar.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Bookmarks/NsHtmlReader.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Bookmarks/NsHtmlReader.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Bookmarks/NsHtmlWriter.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Bookmarks/NsHtmlWriter.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Bookmarks/XbelReader.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Bookmarks/XbelReader.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Bookmarks/XbelWriter.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Bookmarks/XbelWriter.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Bookmarks/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Bookmarks/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/ClosedTabsManager.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/ClosedTabsManager.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/CookieJar/CookieExceptionsModel.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/CookieJar/CookieExceptionsModel.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/CookieJar/CookieJar.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/CookieJar/CookieJar.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/CookieJar/CookiesConfigurationDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/CookieJar/CookiesConfigurationDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/CookieJar/CookiesDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/CookieJar/CookiesDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/CookieJar/CookiesExceptionsDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/CookieJar/CookiesExceptionsDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/CookieJar/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/CookieJar/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Download/DownloadAskActionDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Download/DownloadAskActionDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Download/DownloadItem.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Download/DownloadItem.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Download/DownloadManager.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Download/DownloadManager.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Download/DownloadManagerButton.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Download/DownloadManagerButton.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2018 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2018 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Download/DownloadModel.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Download/DownloadModel.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Download/DownloadUtilities.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Download/DownloadUtilities.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Download/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Download/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/FeaturePermissions/FeaturePermissionBar.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/FeaturePermissions/FeaturePermissionBar.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -20,6 +20,8 @@ class FeaturePermissionBar(EricAnimatedWidget): """ Class implementing the feature permission bar widget. + + Note: This is not needed for Qt 6.8+. """ DefaultHeight = 30 @@ -135,6 +137,7 @@ self.__page.loadStarted.disconnect(self.hide) super().hide() + @pyqtSlot() def __permissionDenied(self): """ Private slot handling the user pressing the deny button. @@ -157,6 +160,7 @@ self.hide() + @pyqtSlot() def __permissionGranted(self): """ Private slot handling the user pressing the allow button. @@ -179,9 +183,10 @@ self.hide() + @pyqtSlot() def __permissionUnknown(self): """ - Private slot handling the user closing the dialog without. + Private slot handling the user closing the dialog without a selection. """ if self.__page is None or self.__manager is None: return
--- a/src/eric7/WebBrowser/FeaturePermissions/FeaturePermissionManager.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/FeaturePermissions/FeaturePermissionManager.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -18,6 +18,8 @@ class FeaturePermissionManager(QObject): """ Class implementing the feature permission manager object. + + Note: This is not needed for Qt 6.8+. """ SettingsKeyFormat = "WebBrowser/FeaturePermissions/{0}"
--- a/src/eric7/WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,17 +1,26 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ Module implementing the feature permission dialog. """ +import contextlib + from PyQt6.QtCore import Qt, pyqtSlot -from PyQt6.QtWebEngineCore import QWebEnginePage from PyQt6.QtWidgets import QAbstractItemView, QDialog, QTreeWidget, QTreeWidgetItem +try: + # Qt 6.8+ + from PyQt6.QtWebEngineCore import QWebEnginePermission +except ImportError: + # Qt <6.8 + from PyQt6.QtWebEngineCore import QWebEnginePage + from eric7.EricGui import EricPixmapCache +from eric7.SystemUtilities import QtUtilities from .Ui_FeaturePermissionsDialog import Ui_FeaturePermissionsDialog @@ -26,8 +35,8 @@ Constructor @param featurePermissions dictionary with remembered feature - permissions - @type dict of dict of list + permissions (Qt <6.8) or a list of permission objects (Qt 6.8+) + @type dict of dict of list or list of QWebEnginePermission @param parent reference to the parent widget @type QWidget """ @@ -166,6 +175,44 @@ self.tr("Desktop Audio && Video"), ) + if QtUtilities.qVersionTuple() >= (6, 8, 0): + # Qt 6.8+ + self.clipboardList = QTreeWidget() + self.clipboardList.setAlternatingRowColors(True) + self.clipboardList.setSelectionMode( + QAbstractItemView.SelectionMode.ExtendedSelection + ) + self.clipboardList.setRootIsDecorated(False) + self.clipboardList.setItemsExpandable(False) + self.clipboardList.setAllColumnsShowFocus(True) + self.clipboardList.setObjectName("camList") + self.clipboardList.setSortingEnabled(True) + self.clipboardList.headerItem().setText(0, self.tr("Host")) + self.clipboardList.headerItem().setText(1, self.tr("Permission")) + self.tabWidget.addTab( + self.clipboardList, + EricPixmapCache.getIcon("clipboard"), + self.tr("Clipboard"), + ) + + self.localFontsList = QTreeWidget() + self.localFontsList.setAlternatingRowColors(True) + self.localFontsList.setSelectionMode( + QAbstractItemView.SelectionMode.ExtendedSelection + ) + self.localFontsList.setRootIsDecorated(False) + self.localFontsList.setItemsExpandable(False) + self.localFontsList.setAllColumnsShowFocus(True) + self.localFontsList.setObjectName("camList") + self.localFontsList.setSortingEnabled(True) + self.localFontsList.headerItem().setText(0, self.tr("Host")) + self.localFontsList.headerItem().setText(1, self.tr("Permission")) + self.tabWidget.addTab( + self.localFontsList, + EricPixmapCache.getIcon("font"), + self.tr("Local Fonts"), + ) + self.setTabOrder(self.tabWidget, self.notifList) self.setTabOrder(self.notifList, self.geoList) self.setTabOrder(self.geoList, self.micList) @@ -174,9 +221,77 @@ self.setTabOrder(self.micCamList, self.mouseLockList) self.setTabOrder(self.mouseLockList, self.deskVidList) self.setTabOrder(self.deskVidList, self.deskAudVidList) - self.setTabOrder(self.deskAudVidList, self.removeButton) + if QtUtilities.qVersionTuple() >= (6, 8, 0): + # Qt 6.8+ + self.setTabOrder(self.deskAudVidList, self.clipboardList) + self.setTabOrder(self.clipboardList, self.localFontsList) + self.setTabOrder(self.localFontsList, self.removeButton) + else: + self.setTabOrder(self.deskAudVidList, self.removeButton) self.setTabOrder(self.removeButton, self.removeAllButton) + if QtUtilities.qVersionTuple() >= (6, 8, 0): + # Qt 6.8+ + self.__initializePermissionsList_qt68(featurePermissions) + else: + # Qt <6.8 + self.__initializePermissionsList_qt67(featurePermissions) + + self.__removedPermissions = [] + self.__previousCurrent = -1 + self.tabWidget.currentChanged.connect(self.__currentTabChanged) + self.tabWidget.setCurrentIndex(0) + + def __initializePermissionsList_qt68(self, permissions): + """ + Private method to initialize the permission lists for Qt 6.8+. + + @param permissions list of permission objects + @type list of QWebEnginePermission + """ + self.__permissionStrings = { + QWebEnginePermission.State.Granted: self.tr("Allow"), + QWebEnginePermission.State.Denied: self.tr("Deny"), + QWebEnginePermission.State.Ask: self.tr("Always Ask"), + QWebEnginePermission.State.Invalid: self.tr("Invalid"), + } + + self.__permissionsLists = { + QWebEnginePermission.PermissionType.Geolocation: self.geoList, + QWebEnginePermission.PermissionType.MediaAudioCapture: self.micList, + QWebEnginePermission.PermissionType.MediaVideoCapture: self.camList, + QWebEnginePermission.PermissionType.MediaAudioVideoCapture: self.micCamList, + QWebEnginePermission.PermissionType.MouseLock: self.mouseLockList, + QWebEnginePermission.PermissionType.DesktopVideoCapture: self.deskVidList, + QWebEnginePermission.PermissionType.DesktopAudioVideoCapture: ( + self.deskAudVidList + ), + QWebEnginePermission.PermissionType.Notifications: self.notifList, + QWebEnginePermission.PermissionType.ClipboardReadWrite: self.clipboardList, + QWebEnginePermission.PermissionType.LocalFontsAccess: self.localFontsList, + } + + for permission in permissions: + with contextlib.suppress(KeyError): + permissionsList = self.__permissionsLists[permission.permissionType()] + itm = QTreeWidgetItem( + permissionsList, + [ + permission.origin().toString(), + self.__permissionStrings[permission.state()], + ], + ) + itm.setData(0, Qt.ItemDataRole.UserRole, permission) + for permissionsList in self.__permissionsLists.values(): + permissionsList.resizeColumnToContents(0) + + def __initializePermissionsList_qt67(self, permissions): + """ + Private method to initialize the permission lists for Qt <6.8. + + @param permissions dictionary with remembered feature permissions + @type dict of dict of list + """ self.__permissionStrings = { QWebEnginePage.PermissionPolicy.PermissionGrantedByUser: self.tr("Allow"), QWebEnginePage.PermissionPolicy.PermissionDeniedByUser: self.tr("Deny"), @@ -194,16 +309,14 @@ } for feature, permissionsList in self.__permissionsLists.items(): - for permission in featurePermissions[feature]: - for host in featurePermissions[feature][permission]: + for permission in permissions[feature]: + for host in permissions[feature][permission]: itm = QTreeWidgetItem( - permissionsList, [host, self.__permissionStrings[permission]] + permissionsList, + [host, self.__permissionStrings[permission]], ) itm.setData(0, Qt.ItemDataRole.UserRole, permission) - - self.__previousCurrent = -1 - self.tabWidget.currentChanged.connect(self.__currentTabChanged) - self.tabWidget.setCurrentIndex(0) + permissionsList.resizeColumnToContents(0) @pyqtSlot(int) def __currentTabChanged(self, index): @@ -247,6 +360,7 @@ for itm in currentList.selectedItems(): row = currentList.indexOfTopLevelItem(itm) itm = currentList.takeTopLevelItem(row) + self.__removedPermissions.append(itm.data(0, Qt.ItemDataRole.UserRole)) del itm self.__updateButtons() @@ -258,6 +372,7 @@ currentList = self.tabWidget.currentWidget() while currentList.topLevelItemCount() > 0: itm = currentList.takeTopLevelItem(0) # __IGNORE_WARNING__ + self.__removedPermissions.append(itm.data(0, Qt.ItemDataRole.UserRole)) del itm self.__updateButtons() @@ -268,6 +383,7 @@ @return new feature permission settings @rtype dict of dict of list """ + # Qt <6.8 featurePermissions = {} for feature, permissionsList in self.__permissionsLists.items(): featurePermissions[feature] = { @@ -281,3 +397,11 @@ featurePermissions[feature][permission].append(host) return featurePermissions + + def persistChanges(self): + """ + Public method to persist the removed permissions. + """ + # Qt 6.8+ + for permission in self.__removedPermissions: + permission.reset()
--- a/src/eric7/WebBrowser/FeaturePermissions/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/FeaturePermissions/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Feeds/FeedEditDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Feeds/FeedEditDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Feeds/FeedsDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Feeds/FeedsDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Feeds/FeedsManager.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Feeds/FeedsManager.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Feeds/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Feeds/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> #
--- a/src/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationListDelegate.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationListDelegate.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationListWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationListWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationScriptInfoDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationScriptInfoDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyConfiguration/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyConfiguration/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyDownloader.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyDownloader.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyJavaScript.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyJavaScript.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyJsObject.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyJsObject.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyManager.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyManager.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyScript.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyScript.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/GreaseMonkey/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/GreaseMonkey/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/History/HistoryCompleter.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/History/HistoryCompleter.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/History/HistoryDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/History/HistoryDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/History/HistoryFilterModel.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/History/HistoryFilterModel.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/History/HistoryManager.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/History/HistoryManager.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/History/HistoryMenu.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/History/HistoryMenu.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/History/HistoryModel.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/History/HistoryModel.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/History/HistoryTreeModel.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/History/HistoryTreeModel.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/History/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/History/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/ImageSearch/ImageSearchEngine.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/ImageSearch/ImageSearchEngine.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/ImageSearch/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/ImageSearch/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/JavaScript/ExternalJsObject.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/JavaScript/ExternalJsObject.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/JavaScript/PasswordManagerJsObject.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/JavaScript/PasswordManagerJsObject.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/JavaScript/StartPageJsObject.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/JavaScript/StartPageJsObject.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/JavaScript/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/JavaScript/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Navigation/NavigationBar.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Navigation/NavigationBar.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Navigation/NavigationContainer.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Navigation/NavigationContainer.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Navigation/ReloadStopButton.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Navigation/ReloadStopButton.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Navigation/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Navigation/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Network/EricSchemeHandler.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Network/EricSchemeHandler.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Network/NetworkManager.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Network/NetworkManager.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -63,10 +63,10 @@ """ super().__init__(parent) - self.__proxyFactory = EricNetworkProxyFactory() if EricPreferences.getNetworkProxy("UseSystemProxy"): QNetworkProxyFactory.setUseSystemConfiguration(True) else: + self.__proxyFactory = EricNetworkProxyFactory() QNetworkProxyFactory.setApplicationProxyFactory(self.__proxyFactory) QNetworkProxyFactory.setUseSystemConfiguration(False) @@ -425,6 +425,7 @@ if EricPreferences.getNetworkProxy("UseSystemProxy"): QNetworkProxyFactory.setUseSystemConfiguration(True) else: + self.__proxyFactory = EricNetworkProxyFactory() QNetworkProxyFactory.setApplicationProxyFactory(self.__proxyFactory) QNetworkProxyFactory.setUseSystemConfiguration(False)
--- a/src/eric7/WebBrowser/Network/NetworkUrlInterceptor.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Network/NetworkUrlInterceptor.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Network/ProtocolHandlerManager.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Network/ProtocolHandlerManager.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Network/ProtocolHandlerManagerDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Network/ProtocolHandlerManagerDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Network/SendRefererWhitelistDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Network/SendRefererWhitelistDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Network/SslErrorExceptionsDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Network/SslErrorExceptionsDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Network/UrlInterceptor.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Network/UrlInterceptor.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Network/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Network/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/OpenSearch/DefaultSearchEngines/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/OpenSearch/DefaultSearchEngines/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2013 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2013 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/OpenSearch/OpenSearchDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/OpenSearch/OpenSearchDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/OpenSearch/OpenSearchEditDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/OpenSearch/OpenSearchEditDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/OpenSearch/OpenSearchEngine.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/OpenSearch/OpenSearchEngine.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/OpenSearch/OpenSearchEngineAction.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/OpenSearch/OpenSearchEngineAction.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/OpenSearch/OpenSearchEngineModel.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/OpenSearch/OpenSearchEngineModel.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/OpenSearch/OpenSearchManager.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/OpenSearch/OpenSearchManager.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/OpenSearch/OpenSearchReader.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/OpenSearch/OpenSearchReader.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/OpenSearch/OpenSearchWriter.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/OpenSearch/OpenSearchWriter.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/OpenSearch/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/OpenSearch/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/PageScreenDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/PageScreenDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Passwords/LoginForm.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Passwords/LoginForm.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Passwords/PasswordManager.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Passwords/PasswordManager.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Passwords/PasswordModel.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Passwords/PasswordModel.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Passwords/PasswordReader.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Passwords/PasswordReader.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Passwords/PasswordWriter.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Passwords/PasswordWriter.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Passwords/PasswordsDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Passwords/PasswordsDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Passwords/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Passwords/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/PersonalInformationManager/PersonalDataDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/PersonalInformationManager/PersonalDataDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/PersonalInformationManager/PersonalInformationManager.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/PersonalInformationManager/PersonalInformationManager.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/PersonalInformationManager/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/PersonalInformationManager/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/SafeBrowsing/SafeBrowsingCache.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/SafeBrowsing/SafeBrowsingCache.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/SafeBrowsing/SafeBrowsingDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/SafeBrowsing/SafeBrowsingDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/SafeBrowsing/SafeBrowsingInfoWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/SafeBrowsing/SafeBrowsingInfoWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/SafeBrowsing/SafeBrowsingLabel.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/SafeBrowsing/SafeBrowsingLabel.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/SafeBrowsing/SafeBrowsingManager.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/SafeBrowsing/SafeBrowsingManager.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/SafeBrowsing/SafeBrowsingThreatList.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/SafeBrowsing/SafeBrowsingThreatList.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2018 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2018 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/SafeBrowsing/SafeBrowsingUrl.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/SafeBrowsing/SafeBrowsingUrl.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/SafeBrowsing/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/SafeBrowsing/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/SearchWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/SearchWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Session/SessionManager.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Session/SessionManager.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Session/SessionManagerDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Session/SessionManagerDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Session/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Session/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/SiteInfo/SiteInfoDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/SiteInfo/SiteInfoDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/SiteInfo/SiteInfoWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/SiteInfo/SiteInfoWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/SiteInfo/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/SiteInfo/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/SpeedDial/Page.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/SpeedDial/Page.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/SpeedDial/PageThumbnailer.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/SpeedDial/PageThumbnailer.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/SpeedDial/SpeedDial.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/SpeedDial/SpeedDial.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/SpeedDial/SpeedDialReader.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/SpeedDial/SpeedDialReader.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> #
--- a/src/eric7/WebBrowser/SpeedDial/SpeedDialWriter.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/SpeedDial/SpeedDialWriter.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/SpeedDial/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/SpeedDial/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/SpellCheck/ManageDictionariesDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/SpellCheck/ManageDictionariesDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/SpellCheck/SpellCheckDictionariesReader.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/SpellCheck/SpellCheckDictionariesReader.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/SpellCheck/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/SpellCheck/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> #
--- a/src/eric7/WebBrowser/StatusBar/ImagesIcon.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/StatusBar/ImagesIcon.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/StatusBar/JavaScriptIcon.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/StatusBar/JavaScriptIcon.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/StatusBar/JavaScriptSettingsDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/StatusBar/JavaScriptSettingsDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/StatusBar/StatusBarIcon.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/StatusBar/StatusBarIcon.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/StatusBar/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/StatusBar/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Sync/DirectorySyncHandler.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Sync/DirectorySyncHandler.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Sync/FtpSyncHandler.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Sync/FtpSyncHandler.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Sync/SyncAssistantDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Sync/SyncAssistantDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Sync/SyncCheckPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Sync/SyncCheckPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Sync/SyncDataPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Sync/SyncDataPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Sync/SyncDirectorySettingsPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Sync/SyncDirectorySettingsPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Sync/SyncEncryptionPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Sync/SyncEncryptionPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Sync/SyncFtpSettingsPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Sync/SyncFtpSettingsPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Sync/SyncGlobals.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Sync/SyncGlobals.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Sync/SyncHandler.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Sync/SyncHandler.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Sync/SyncHostTypePage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Sync/SyncHostTypePage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Sync/SyncManager.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Sync/SyncManager.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Sync/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Sync/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/TabManager/TabManagerWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/TabManager/TabManagerWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/TabManager/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/TabManager/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Tools/DelayedFileWatcher.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Tools/DelayedFileWatcher.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Tools/PrintToPdfDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Tools/PrintToPdfDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Tools/Scripts.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Tools/Scripts.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Tools/WebBrowserTools.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Tools/WebBrowserTools.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Tools/WebHitTestResult.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Tools/WebHitTestResult.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Tools/WebIconDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Tools/WebIconDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Tools/WebIconLoader.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Tools/WebIconLoader.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Tools/WebIconProvider.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Tools/WebIconProvider.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Tools/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Tools/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/Ui_WebBrowserClearPrivateDataDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/Ui_WebBrowserClearPrivateDataDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # Form implementation generated from reading ui file 'src/eric7/WebBrowser/WebBrowserClearPrivateDataDialog.ui' # -# Created by: PyQt6 UI code generator 6.7.0 +# Created by: PyQt6 UI code generator 6.8.0 # # WARNING: Any manual changes made to this file will be lost when pyuic6 is # run again. Do not edit this file unless you know what you are doing. @@ -58,6 +58,9 @@ self.iconsCheckBox.setChecked(True) self.iconsCheckBox.setObjectName("iconsCheckBox") self.verticalLayout.addWidget(self.iconsCheckBox) + self.permissionsCheckBox = QtWidgets.QCheckBox(parent=WebBrowserClearPrivateDataDialog) + self.permissionsCheckBox.setObjectName("permissionsCheckBox") + self.verticalLayout.addWidget(self.permissionsCheckBox) self.passwordsCheckBox = QtWidgets.QCheckBox(parent=WebBrowserClearPrivateDataDialog) self.passwordsCheckBox.setChecked(False) self.passwordsCheckBox.setObjectName("passwordsCheckBox") @@ -87,7 +90,8 @@ WebBrowserClearPrivateDataDialog.setTabOrder(self.downloadsCheckBox, self.cookiesCheckBox) WebBrowserClearPrivateDataDialog.setTabOrder(self.cookiesCheckBox, self.cacheCheckBox) WebBrowserClearPrivateDataDialog.setTabOrder(self.cacheCheckBox, self.iconsCheckBox) - WebBrowserClearPrivateDataDialog.setTabOrder(self.iconsCheckBox, self.passwordsCheckBox) + WebBrowserClearPrivateDataDialog.setTabOrder(self.iconsCheckBox, self.permissionsCheckBox) + WebBrowserClearPrivateDataDialog.setTabOrder(self.permissionsCheckBox, self.passwordsCheckBox) WebBrowserClearPrivateDataDialog.setTabOrder(self.passwordsCheckBox, self.zoomCheckBox) WebBrowserClearPrivateDataDialog.setTabOrder(self.zoomCheckBox, self.sslExceptionsCheckBox) @@ -95,7 +99,7 @@ _translate = QtCore.QCoreApplication.translate WebBrowserClearPrivateDataDialog.setWindowTitle(_translate("WebBrowserClearPrivateDataDialog", "Clear Private Data")) self.historyCheckBox.setToolTip(_translate("WebBrowserClearPrivateDataDialog", "Select to clear the browsing history")) - self.historyCheckBox.setText(_translate("WebBrowserClearPrivateDataDialog", "&Browsing History")) + self.historyCheckBox.setText(_translate("WebBrowserClearPrivateDataDialog", "Browsing History")) self.historyCombo.setToolTip(_translate("WebBrowserClearPrivateDataDialog", "Select the history period to be deleted")) self.historyCombo.setItemText(0, _translate("WebBrowserClearPrivateDataDialog", "Last Hour")) self.historyCombo.setItemText(1, _translate("WebBrowserClearPrivateDataDialog", "Last Day")) @@ -103,17 +107,19 @@ self.historyCombo.setItemText(3, _translate("WebBrowserClearPrivateDataDialog", "Last 4 Weeks")) self.historyCombo.setItemText(4, _translate("WebBrowserClearPrivateDataDialog", "Whole Period")) self.searchCheckBox.setToolTip(_translate("WebBrowserClearPrivateDataDialog", "Select to clear the search history")) - self.searchCheckBox.setText(_translate("WebBrowserClearPrivateDataDialog", "&Search History")) + self.searchCheckBox.setText(_translate("WebBrowserClearPrivateDataDialog", "Search History")) self.downloadsCheckBox.setToolTip(_translate("WebBrowserClearPrivateDataDialog", "Select to clear the download history")) - self.downloadsCheckBox.setText(_translate("WebBrowserClearPrivateDataDialog", "Download &History")) + self.downloadsCheckBox.setText(_translate("WebBrowserClearPrivateDataDialog", "Download History")) self.cookiesCheckBox.setToolTip(_translate("WebBrowserClearPrivateDataDialog", "Select to clear the cookies")) - self.cookiesCheckBox.setText(_translate("WebBrowserClearPrivateDataDialog", "&Cookies")) + self.cookiesCheckBox.setText(_translate("WebBrowserClearPrivateDataDialog", "Cookies")) self.cacheCheckBox.setToolTip(_translate("WebBrowserClearPrivateDataDialog", "Select to clear the disk cache")) - self.cacheCheckBox.setText(_translate("WebBrowserClearPrivateDataDialog", "Cached &Web Pages")) + self.cacheCheckBox.setText(_translate("WebBrowserClearPrivateDataDialog", "Cached Web Pages")) self.iconsCheckBox.setToolTip(_translate("WebBrowserClearPrivateDataDialog", "Select to clear the website icons")) - self.iconsCheckBox.setText(_translate("WebBrowserClearPrivateDataDialog", "Website &Icons")) + self.iconsCheckBox.setText(_translate("WebBrowserClearPrivateDataDialog", "Website Icons")) + self.permissionsCheckBox.setToolTip(_translate("WebBrowserClearPrivateDataDialog", "Select to clear the website permissions")) + self.permissionsCheckBox.setText(_translate("WebBrowserClearPrivateDataDialog", "Website Permissions")) self.passwordsCheckBox.setToolTip(_translate("WebBrowserClearPrivateDataDialog", "Select to clear the saved passwords")) - self.passwordsCheckBox.setText(_translate("WebBrowserClearPrivateDataDialog", "Saved &Passwords")) + self.passwordsCheckBox.setText(_translate("WebBrowserClearPrivateDataDialog", "Saved Passwords")) self.zoomCheckBox.setToolTip(_translate("WebBrowserClearPrivateDataDialog", "Select to delete all remembered zoom settings")) - self.zoomCheckBox.setText(_translate("WebBrowserClearPrivateDataDialog", "&Zoom Settings")) + self.zoomCheckBox.setText(_translate("WebBrowserClearPrivateDataDialog", "Zoom Settings")) self.sslExceptionsCheckBox.setText(_translate("WebBrowserClearPrivateDataDialog", "SSL Certificate Error Exceptions"))
--- a/src/eric7/WebBrowser/UrlBar/BookmarkActionSelectionDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/UrlBar/BookmarkActionSelectionDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/UrlBar/BookmarkInfoDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/UrlBar/BookmarkInfoDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/UrlBar/FavIconLabel.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/UrlBar/FavIconLabel.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/UrlBar/SslLabel.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/UrlBar/SslLabel.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2020 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2020 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/UrlBar/StackedUrlBar.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/UrlBar/StackedUrlBar.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/UrlBar/UrlBar.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/UrlBar/UrlBar.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/UrlBar/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/UrlBar/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/UserAgent/UserAgentManager.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/UserAgent/UserAgentManager.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/UserAgent/UserAgentMenu.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/UserAgent/UserAgentMenu.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/UserAgent/UserAgentModel.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/UserAgent/UserAgentModel.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/UserAgent/UserAgentReader.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/UserAgent/UserAgentReader.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> #
--- a/src/eric7/WebBrowser/UserAgent/UserAgentWriter.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/UserAgent/UserAgentWriter.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/UserAgent/UserAgentsDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/UserAgent/UserAgentsDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/UserAgent/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/UserAgent/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/VirusTotal/VirusTotalApi.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/VirusTotal/VirusTotalApi.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/VirusTotal/VirusTotalDomainReportDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/VirusTotal/VirusTotalDomainReportDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/VirusTotal/VirusTotalIpReportDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/VirusTotal/VirusTotalIpReportDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/VirusTotal/VirusTotalWhoisDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/VirusTotal/VirusTotalWhoisDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/VirusTotal/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/VirusTotal/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/WebAuth/Fido2InfoDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/WebAuth/Fido2InfoDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2024 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/WebAuth/Fido2Management.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/WebAuth/Fido2Management.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2024 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/WebAuth/Fido2ManagementDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/WebAuth/Fido2ManagementDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2024 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/WebAuth/Fido2PasskeyEditDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/WebAuth/Fido2PasskeyEditDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2024 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/WebAuth/Fido2PinDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/WebAuth/Fido2PinDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2024 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/WebAuth/WebBrowserWebAuthDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/WebAuth/WebBrowserWebAuthDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2024 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/WebAuth/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/WebAuth/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2024 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/WebBrowserArgumentsCreator.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/WebBrowserArgumentsCreator.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -26,7 +26,7 @@ # 1. create the argument parser parser = argparse.ArgumentParser( description="Web Browser application of the eric tool suite.", - epilog="Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de>.", + epilog="Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de>.", ) # 2. add the arguments
--- a/src/eric7/WebBrowser/WebBrowserClearPrivateDataDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/WebBrowserClearPrivateDataDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -9,6 +9,8 @@ from PyQt6.QtWidgets import QDialog +from eric7.SystemUtilities import QtUtilities + from .Ui_WebBrowserClearPrivateDataDialog import Ui_WebBrowserClearPrivateDataDialog @@ -27,6 +29,8 @@ super().__init__(parent) self.setupUi(self) + self.permissionsCheckBox.setEnabled(QtUtilities.qVersionTuple() >= (6, 8, 0)) + msh = self.minimumSizeHint() self.resize(max(self.width(), msh.width()), msh.height()) @@ -36,9 +40,10 @@ @return tuple with flags indicating which data to clear (browsing history, search history, favicons, disk cache, cookies, - passwords, downloads, zoom values, SSL certificate error exceptions) and - the selected history period in milliseconds - @rtype tuple of (bool, bool, bool, bool, bool, bool, bool, bool, bool, int) + passwords, downloads, zoom values, SSL certificate error exceptions, + website permissions) and the selected history period in milliseconds + @rtype tuple of (bool, bool, bool, bool, bool, bool, bool, bool, bool, bool, + int) """ index = self.historyCombo.currentIndex() if index == 0: @@ -67,5 +72,10 @@ self.downloadsCheckBox.isChecked(), self.zoomCheckBox.isChecked(), self.sslExceptionsCheckBox.isChecked(), + ( + self.permissionsCheckBox.isChecked() + if QtUtilities.qVersionTuple() >= (6, 8, 0) + else False + ), historyPeriod, )
--- a/src/eric7/WebBrowser/WebBrowserClearPrivateDataDialog.ui Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/WebBrowserClearPrivateDataDialog.ui Tue Jan 14 17:29:56 2025 +0100 @@ -23,7 +23,7 @@ <string>Select to clear the browsing history</string> </property> <property name="text"> - <string>&Browsing History</string> + <string>Browsing History</string> </property> <property name="checked"> <bool>true</bool> @@ -35,7 +35,7 @@ <item> <spacer name="horizontalSpacer"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <property name="sizeHint" stdset="0"> <size> @@ -91,7 +91,7 @@ <string>Select to clear the search history</string> </property> <property name="text"> - <string>&Search History</string> + <string>Search History</string> </property> <property name="checked"> <bool>true</bool> @@ -104,7 +104,7 @@ <string>Select to clear the download history</string> </property> <property name="text"> - <string>Download &History</string> + <string>Download History</string> </property> <property name="checked"> <bool>true</bool> @@ -117,7 +117,7 @@ <string>Select to clear the cookies</string> </property> <property name="text"> - <string>&Cookies</string> + <string>Cookies</string> </property> <property name="checked"> <bool>true</bool> @@ -130,7 +130,7 @@ <string>Select to clear the disk cache</string> </property> <property name="text"> - <string>Cached &Web Pages</string> + <string>Cached Web Pages</string> </property> <property name="checked"> <bool>true</bool> @@ -143,7 +143,7 @@ <string>Select to clear the website icons</string> </property> <property name="text"> - <string>Website &Icons</string> + <string>Website Icons</string> </property> <property name="checked"> <bool>true</bool> @@ -151,12 +151,22 @@ </widget> </item> <item> + <widget class="QCheckBox" name="permissionsCheckBox"> + <property name="toolTip"> + <string>Select to clear the website permissions</string> + </property> + <property name="text"> + <string>Website Permissions</string> + </property> + </widget> + </item> + <item> <widget class="QCheckBox" name="passwordsCheckBox"> <property name="toolTip"> <string>Select to clear the saved passwords</string> </property> <property name="text"> - <string>Saved &Passwords</string> + <string>Saved Passwords</string> </property> <property name="checked"> <bool>false</bool> @@ -169,7 +179,7 @@ <string>Select to delete all remembered zoom settings</string> </property> <property name="text"> - <string>&Zoom Settings</string> + <string>Zoom Settings</string> </property> <property name="checked"> <bool>true</bool> @@ -189,10 +199,10 @@ <item> <widget class="QDialogButtonBox" name="buttonBox"> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Orientation::Horizontal</enum> </property> <property name="standardButtons"> - <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + <set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok</set> </property> </widget> </item> @@ -206,6 +216,7 @@ <tabstop>cookiesCheckBox</tabstop> <tabstop>cacheCheckBox</tabstop> <tabstop>iconsCheckBox</tabstop> + <tabstop>permissionsCheckBox</tabstop> <tabstop>passwordsCheckBox</tabstop> <tabstop>zoomCheckBox</tabstop> <tabstop>sslExceptionsCheckBox</tabstop>
--- a/src/eric7/WebBrowser/WebBrowserJavaScriptConsole.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/WebBrowserJavaScriptConsole.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/WebBrowserLanguagesDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/WebBrowserLanguagesDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/WebBrowserPage.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/WebBrowserPage.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2008 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2008 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # @@ -8,7 +8,10 @@ Module implementing the helpbrowser using QWebView. """ +import contextlib + from PyQt6.QtCore import ( + QCoreApplication, QEventLoop, QPoint, QTimer, @@ -23,6 +26,7 @@ from eric7 import EricUtilities, Preferences from eric7.EricWidgets import EricMessageBox +from eric7.SystemUtilities import QtUtilities from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow from .JavaScript.ExternalJsObject import ExternalJsObject @@ -38,6 +42,9 @@ except ImportError: SSL_AVAILABLE = False +with contextlib.suppress(ImportError): + from PyQt6.QtWebEngineCore import QWebEnginePermission + class WebBrowserPage(QWebEnginePage): """ @@ -66,6 +73,69 @@ sslConfigurationChanged = pyqtSignal() + if QtUtilities.qVersionTuple() >= (6, 8, 0): # noqa: Y108 + PermissionTypeQuestions = { + QWebEnginePermission.PermissionType.Geolocation: QCoreApplication.translate( + "WebBrowserPage", + "<p>Allow <b>{0}</b> to access your location information?</p>", + ), + QWebEnginePermission.PermissionType.MediaAudioCapture: ( + QCoreApplication.translate( + "WebBrowserPage", + "<p>Allow <b>{0}</b> to access your microphone?</p>", + ) + ), + QWebEnginePermission.PermissionType.MediaVideoCapture: ( + QCoreApplication.translate( + "WebBrowserPage", + "<p>Allow <b>{0}</b> to access your webcam?</p>", + ) + ), + QWebEnginePermission.PermissionType.MediaAudioVideoCapture: ( + QCoreApplication.translate( + "WebBrowserPage", + "<p>Allow <b>{0}</b> to access your microphone and webcam?</p>", + ) + ), + QWebEnginePermission.PermissionType.MouseLock: QCoreApplication.translate( + "WebBrowserPage", + "<p>Allow <b>{0}</b> to lock your mouse cursor?</p>", + ), + QWebEnginePermission.PermissionType.DesktopVideoCapture: ( + QCoreApplication.translate( + "WebBrowserPage", + "<p>Allow <b>{0}</b> to capture video of your desktop?</p>", + ) + ), + QWebEnginePermission.PermissionType.DesktopAudioVideoCapture: ( + QCoreApplication.translate( + "WebBrowserPage", + "<p>Allow <b>{0}</b> to capture audio and video of your" + " desktop?</p>", + ) + ), + QWebEnginePermission.PermissionType.Notifications: ( + QCoreApplication.translate( + "WebBrowserPage", + "<p>Allow <b>{0}</b> to show notifications on your desktop?</p>", + ) + ), + QWebEnginePermission.PermissionType.ClipboardReadWrite: ( + QCoreApplication.translate( + "WebBrowserPage", + "<p>Allow <b>{0}</b> to read from and write to the clipboard?</p>", + ) + ), + QWebEnginePermission.PermissionType.LocalFontsAccess: ( + QCoreApplication.translate( + "WebBrowserPage", + "<p>Allow <b>{0}</b> to access fonts stored on this machine?</p>", + ) + ), + } + else: + PermissionTypeQuestions = {} + def __init__(self, view, parent=None): """ Constructor @@ -82,7 +152,12 @@ self.__view = view - self.featurePermissionRequested.connect(self.__featurePermissionRequested) + try: + # Qt 6.8+ + self.permissionRequested.connect(self.__permissionRequested) + except AttributeError: + # Qt <6.8 + self.featurePermissionRequested.connect(self.__featurePermissionRequested) self.authenticationRequired.connect( lambda url, auth: WebBrowserWindow.networkManager().authentication( url, auth, self @@ -303,14 +378,34 @@ @param feature requested feature @type QWebEnginePage.Feature """ + # Qt <6.8 manager = WebBrowserWindow.featurePermissionManager() manager.requestFeaturePermission(self, url, feature) + def __permissionRequested(self, permission): + """ + Private slot handling a permission request. + + @param permission reference to the permission request object + @type QWebEnginePermission + """ + # Qt 6.8+ + question = self.PermissionTypeQuestions.get(permission.permissionType()) + if question and EricMessageBox.yesNo( + self.view(), + self.tr("Permission Request"), + question.format(permission.origin().host()), + yesDefault=True, + ): + permission.grant() + else: + permission.deny() + def execJavaScript( self, script, worldId=QWebEngineScript.ScriptWorldId.MainWorld, timeout=500 ): """ - Public method to execute a JavaScript function synchroneously. + Public method to execute a JavaScript function synchronously. @param script JavaScript script source to be executed @type str
--- a/src/eric7/WebBrowser/WebBrowserSingleApplication.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/WebBrowserSingleApplication.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2018 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2018 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> #
--- a/src/eric7/WebBrowser/WebBrowserSnap.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/WebBrowserSnap.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/WebBrowserTabBar.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/WebBrowserTabBar.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/WebBrowserTabWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/WebBrowserTabWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/WebBrowserView.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/WebBrowserView.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2008 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2008 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> #
--- a/src/eric7/WebBrowser/WebBrowserWebSearchWidget.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/WebBrowserWebSearchWidget.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/WebBrowserWindow.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/WebBrowserWindow.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -4180,7 +4180,7 @@ if dlg.exec() == QDialog.DialogCode.Accepted: # browsing history, search history, favicons, disk cache, cookies, # passwords, web databases, downloads, zoom values, SSL error - # exceptions, history period + # exceptions, website permissions, history period ( history, searches, @@ -4191,6 +4191,7 @@ downloads, zoomValues, sslExceptions, + permissions, historyPeriod, ) = dlg.getData() if history: @@ -4220,6 +4221,9 @@ ZoomManager.instance().clear() if sslExceptions: self.networkManager().clearSslExceptions() + if permissions and QtUtilities.qVersionTuple() >= (6, 8, 0): + for permission in self.webProfile().listAllPermissions(): + permission.reset() @pyqtSlot() def __showEnginesConfigurationDialog(self): @@ -4294,7 +4298,20 @@ """ Private slot to show the feature permission dialog. """ - self.featurePermissionManager().showFeaturePermissionsDialog(self) + if QtUtilities.qVersionTuple() >= (6, 8, 0): + # Qt 6.8+ + from .FeaturePermissions.FeaturePermissionsDialog import ( # noqa: I101 + FeaturePermissionsDialog, + ) + + dlg = FeaturePermissionsDialog( + self.webProfile().listAllPermissions(), parent=self + ) + if dlg.exec() == QDialog.DialogCode.Accepted: + dlg.persistChanges() + else: + # Qt <6.8 + self.featurePermissionManager().showFeaturePermissionsDialog(self) @pyqtSlot() def __showZoomValuesDialog(self): @@ -5392,9 +5409,9 @@ if cls._webProfile is None: if private: - cls._webProfile = QWebEngineProfile() + cls._webProfile = QWebEngineProfile.defaultProfile() else: - cls._webProfile = QWebEngineProfile.defaultProfile() + cls._webProfile = QWebEngineProfile("eric7") cls._webProfile.downloadRequested.connect(cls.downloadRequested) # add the default user agent string @@ -5430,6 +5447,13 @@ cls._webProfile.setPushServiceEnabled( Preferences.getWebBrowser("PushServiceEnabled") ) + with contextlib.suppress(AttributeError): + # Qt 6.8+ + cls._webProfile.setPersistentPermissionsPolicy( + QWebEngineProfile.PersistentPermissionsPolicy.StoreInMemory + if Preferences.getWebBrowser("NoPersistentPermissions") + else QWebEngineProfile.PersistentPermissionsPolicy.StoreOnDisk + ) with contextlib.suppress(AttributeError): cls._webProfile.setSpellCheckEnabled(
--- a/src/eric7/WebBrowser/WebInspector.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/WebInspector.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/ZoomManager/ZoomManager.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/ZoomManager/ZoomManager.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/ZoomManager/ZoomValuesDialog.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/ZoomManager/ZoomValuesDialog.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/ZoomManager/ZoomValuesModel.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/ZoomManager/ZoomValuesModel.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/ZoomManager/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/ZoomManager/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2015 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2015 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/WebBrowser/data/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/WebBrowser/data/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/XML/XMLStreamReaderBase.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/XML/XMLStreamReaderBase.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2010 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2010 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/XML/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/XML/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2004 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2004 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/__init__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/__init__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/__main__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/__main__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2022 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2022 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/__version__.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/__version__.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2024 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/eric7_api.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_api.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -37,7 +37,7 @@ "Create API files to be used by 'QScintilla' or the 'eric Assistant'" " plugin. It is part of the eric tool suite." ), - epilog="Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de>.", + epilog="Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de>.", ) parser.add_argument(
--- a/src/eric7/eric7_browser.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_browser.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/eric7_browser.pyw Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_browser.pyw Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/eric7_compare.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_compare.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -32,7 +32,7 @@ parser = argparse.ArgumentParser( description="Simple graphical tool to compare two files side-by-side." " It is part of the eric tool suite.", - epilog="Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de>.", + epilog="Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de>.", ) # 2. add the arguments
--- a/src/eric7/eric7_compare.pyw Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_compare.pyw Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/eric7_configure.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_configure.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -29,7 +29,7 @@ # 1. create the argument parser parser = argparse.ArgumentParser( description="Graphical configuration editor for the eric tool suite.", - epilog="Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de>.", + epilog="Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de>.", ) # 2. add the arguments
--- a/src/eric7/eric7_configure.pyw Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_configure.pyw Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/eric7_diff.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_diff.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -31,7 +31,7 @@ # 1. create the argument parser parser = argparse.ArgumentParser( description="Simple graphical diff tool of the eric tool suite.", - epilog="Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de>.", + epilog="Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de>.", ) # 2. add the arguments
--- a/src/eric7/eric7_diff.pyw Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_diff.pyw Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/eric7_doc.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_doc.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -42,7 +42,7 @@ parser = argparse.ArgumentParser( description="Create source code documentation files. It is part of the eric" " tool suite.", - epilog="Copyright (c) 2003 - 2024 Detlev Offenbach <detlev@die-offenbachs.de>.", + epilog="Copyright (c) 2003 - 2025 Detlev Offenbach <detlev@die-offenbachs.de>.", ) parser.add_argument(
--- a/src/eric7/eric7_editor.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_editor.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -31,7 +31,7 @@ # 1. create the argument parser parser = argparse.ArgumentParser( description="Simplified version of the eric-ide editor of the eric tool suite.", - epilog="Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de>.", + epilog="Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de>.", ) # 2. add the arguments
--- a/src/eric7/eric7_editor.pyw Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_editor.pyw Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/eric7_fido2.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_fido2.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (c) 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2024 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -33,7 +33,7 @@ # 1. create the argument parser parser = argparse.ArgumentParser( description="Management tool for FIDO2 Security Keys.", - epilog="Copyright (c) 2024 Detlev Offenbach <detlev@die-offenbachs.de>.", + epilog="Copyright (c) 2024 - 2025 Detlev Offenbach <detlev@die-offenbachs.de>.", ) # 2. add the arguments
--- a/src/eric7/eric7_fido2.pyw Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_fido2.pyw Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2024 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/eric7_hexeditor.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_hexeditor.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -31,7 +31,7 @@ # 1. create the argument parser parser = argparse.ArgumentParser( description="Graphical tool of the eric tool suite to edit binary files.", - epilog="Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de>.", + epilog="Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de>.", ) # 2. add the arguments
--- a/src/eric7/eric7_hexeditor.pyw Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_hexeditor.pyw Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2016 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2016 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/eric7_iconeditor.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_iconeditor.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -31,7 +31,7 @@ # 1. create the argument parser parser = argparse.ArgumentParser( description="Graphical tool of the eric tool suite to edit icon files.", - epilog="Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de>.", + epilog="Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de>.", ) # 2. add the arguments
--- a/src/eric7/eric7_iconeditor.pyw Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_iconeditor.pyw Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/eric7_ide.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_ide.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/eric7_ide.pyw Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_ide.pyw Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2005 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2005 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/eric7_mpy.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_mpy.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2024 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -30,7 +30,7 @@ parser = argparse.ArgumentParser( description="Graphical tool of the eric tool suite to interact with µPy/CPy" " devices", - epilog="Copyright (c) 2024 Detlev Offenbach <detlev@die-offenbachs.de>.", + epilog="Copyright (c) 2024 - 2025 Detlev Offenbach <detlev@die-offenbachs.de>.", ) # 2. add the arguments
--- a/src/eric7/eric7_mpy.pyw Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_mpy.pyw Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2024 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/eric7_pdf.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_pdf.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -31,7 +31,7 @@ # 1. create the argument parser parser = argparse.ArgumentParser( description="Graphical tool of the eric tool suite to view PDF files.", - epilog="Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de>.", + epilog="Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de>.", ) # 2. add the arguments
--- a/src/eric7/eric7_pdf.pyw Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_pdf.pyw Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/eric7_pip.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_pip.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -31,7 +31,7 @@ parser = argparse.ArgumentParser( description="Graphical tool of the eric tool suite to manage Python packages" " with 'pip'.", - epilog="Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de>.", + epilog="Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de>.", ) # 2. add the arguments
--- a/src/eric7/eric7_pip.pyw Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_pip.pyw Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2023 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2023 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/eric7_plugininstall.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_plugininstall.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -30,7 +30,7 @@ # 1. create the argument parser parser = argparse.ArgumentParser( description="Graphical plugin installation tool of the eric tool suite.", - epilog="Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de>.", + epilog="Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de>.", ) # 2. add the arguments
--- a/src/eric7/eric7_plugininstall.pyw Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_plugininstall.pyw Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/eric7_pluginrepository.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_pluginrepository.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -31,7 +31,7 @@ parser = argparse.ArgumentParser( description="Graphical tool of the eric tool suite to show the contents of the" " eric Plugins repository.", - epilog="Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de>.", + epilog="Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de>.", ) # 2. add the arguments
--- a/src/eric7/eric7_pluginrepository.pyw Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_pluginrepository.pyw Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/eric7_pluginuninstall.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_pluginuninstall.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -30,7 +30,7 @@ # 1. create the argument parser parser = argparse.ArgumentParser( description="Graphical plugin uninstallation tool of the eric tool suite.", - epilog="Copyright (c) 2007 - 2024 Detlev Offenbach <detlev@die-offenbachs.de>.", + epilog="Copyright (c) 2007 - 2025 Detlev Offenbach <detlev@die-offenbachs.de>.", ) # 2. add the arguments
--- a/src/eric7/eric7_pluginuninstall.pyw Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_pluginuninstall.pyw Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/eric7_post_install.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_post_install.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/eric7_qregularexpression.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_qregularexpression.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (c) 2013 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2013 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -32,7 +32,7 @@ parser = argparse.ArgumentParser( description="Graphical regexp editor for the Qt QRegularExpression class." " It is part of the eric tool suite.", - epilog="Copyright (c) 2013 - 2024 Detlev Offenbach <detlev@die-offenbachs.de>.", + epilog="Copyright (c) 2013 - 2025 Detlev Offenbach <detlev@die-offenbachs.de>.", ) # 2. add the arguments
--- a/src/eric7/eric7_qregularexpression.pyw Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_qregularexpression.pyw Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2013 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2013 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/eric7_re.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_re.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (c) 2004 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2004 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -32,7 +32,7 @@ parser = argparse.ArgumentParser( description="Graphical regexp editor for the Python re module." " It is part of the eric tool suite.", - epilog="Copyright (c) 2004 - 2024 Detlev Offenbach <detlev@die-offenbachs.de>.", + epilog="Copyright (c) 2004 - 2025 Detlev Offenbach <detlev@die-offenbachs.de>.", ) # 2. add the arguments
--- a/src/eric7/eric7_re.pyw Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_re.pyw Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/eric7_server.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_server.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (c) 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2024 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -32,7 +32,7 @@ "Start the eric-ide server component. This will listen for connections" " from the eric IDE in order to perform remote development." ), - epilog="Copyright (c) 2024 Detlev Offenbach <detlev@die-offenbachs.de>.", + epilog="Copyright (c) 2024 - 2025 Detlev Offenbach <detlev@die-offenbachs.de>.", ) parser.add_argument(
--- a/src/eric7/eric7_shell.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_shell.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -33,7 +33,7 @@ parser = argparse.ArgumentParser( description="Stand alone variant of the eric interpreter shell." " It is part of the eric tool suite.", - epilog="Copyright (c) 2017 - 2024 Detlev Offenbach <detlev@die-offenbachs.de>.", + epilog="Copyright (c) 2017 - 2025 Detlev Offenbach <detlev@die-offenbachs.de>.", ) # 2. add the arguments
--- a/src/eric7/eric7_shell.pyw Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_shell.pyw Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2019 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2019 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/eric7_snap.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_snap.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -31,7 +31,7 @@ parser = argparse.ArgumentParser( description="Graphical tool of the eric tool suite to create snapshots of the" " screen.", - epilog="Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de>.", + epilog="Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de>.", ) # 2. add the arguments
--- a/src/eric7/eric7_snap.pyw Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_snap.pyw Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2012 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2012 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/eric7_sqlbrowser.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_sqlbrowser.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -30,7 +30,7 @@ # 1. create the argument parser parser = argparse.ArgumentParser( description="Graphical tool of the eric tool suite to inspect SQL databases.", - epilog="Copyright (c) 2009 - 2024 Detlev Offenbach <detlev@die-offenbachs.de>.", + epilog="Copyright (c) 2009 - 2025 Detlev Offenbach <detlev@die-offenbachs.de>.", ) # 2. add the arguments
--- a/src/eric7/eric7_sqlbrowser.pyw Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_sqlbrowser.pyw Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/eric7_testing.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_testing.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -31,7 +31,7 @@ # 1. create the argument parser parser = argparse.ArgumentParser( description="Graphical tool of the eric tool suite to execute unit tests.", - epilog="Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de>.", + epilog="Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de>.", ) # 2. add the arguments
--- a/src/eric7/eric7_testing.pyw Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_testing.pyw Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/eric7_tray.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_tray.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -31,7 +31,7 @@ # 1. create the argument parser parser = argparse.ArgumentParser( description="Tray starter for the tools of the eric tool suite.", - epilog="Copyright (c) 2006 - 2024 Detlev Offenbach <detlev@die-offenbachs.de>.", + epilog="Copyright (c) 2006 - 2025 Detlev Offenbach <detlev@die-offenbachs.de>.", ) # 2. add the arguments
--- a/src/eric7/eric7_tray.pyw Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_tray.pyw Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/eric7_trpreviewer.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_trpreviewer.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (c) 2004 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2004 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -31,7 +31,7 @@ # 1. create the argument parser parser = argparse.ArgumentParser( description="Translations file previewer of the eric tool suite.", - epilog="Copyright (c) 2004 - 2024 Detlev Offenbach <detlev@die-offenbachs.de>.", + epilog="Copyright (c) 2004 - 2025 Detlev Offenbach <detlev@die-offenbachs.de>.", ) # 2. add the arguments
--- a/src/eric7/eric7_trpreviewer.pyw Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_trpreviewer.pyw Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/eric7_uipreviewer.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_uipreviewer.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (c) 2004 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2004 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -31,7 +31,7 @@ # 1. create the argument parser parser = argparse.ArgumentParser( description="User Interface file previewer of the eric tool suite.", - epilog="Copyright (c) 2004 - 2024 Detlev Offenbach <detlev@die-offenbachs.de>.", + epilog="Copyright (c) 2004 - 2025 Detlev Offenbach <detlev@die-offenbachs.de>.", ) # 2. add the arguments
--- a/src/eric7/eric7_uipreviewer.pyw Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_uipreviewer.pyw Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2011 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2011 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/eric7_virtualenv.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_virtualenv.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """ @@ -31,7 +31,7 @@ parser = argparse.ArgumentParser( description="Graphical tool of the eric tool suite to manage Python Virtual" " Environments.", - epilog="Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de>.", + epilog="Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de>.", ) # 2. add the arguments
--- a/src/eric7/eric7_virtualenv.pyw Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7_virtualenv.pyw Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2021 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2021 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/eric7config.py Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/eric7config.py Tue Jan 14 17:29:56 2025 +0100 @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2002 - 2024 Detlev Offenbach <detlev@die-offenbachs.de> +# Copyright (c) 2002 - 2025 Detlev Offenbach <detlev@die-offenbachs.de> # """
--- a/src/eric7/i18n/eric7_cs.ts Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/i18n/eric7_cs.ts Tue Jan 14 17:29:56 2025 +0100 @@ -7725,18 +7725,18 @@ <translation>Grafika</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="896" /> + <location filename="../Preferences/ConfigurationDialog.py" line="903" /> <location filename="../Preferences/ConfigurationDialog.py" line="228" /> <source>Hex Editor</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1129" /> - <location filename="../Preferences/ConfigurationDialog.py" line="1090" /> - <location filename="../Preferences/ConfigurationDialog.py" line="982" /> - <location filename="../Preferences/ConfigurationDialog.py" line="944" /> - <location filename="../Preferences/ConfigurationDialog.py" line="913" /> - <location filename="../Preferences/ConfigurationDialog.py" line="882" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1136" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1097" /> + <location filename="../Preferences/ConfigurationDialog.py" line="989" /> + <location filename="../Preferences/ConfigurationDialog.py" line="951" /> + <location filename="../Preferences/ConfigurationDialog.py" line="920" /> + <location filename="../Preferences/ConfigurationDialog.py" line="889" /> <location filename="../Preferences/ConfigurationDialog.py" line="785" /> <location filename="../Preferences/ConfigurationDialog.py" line="670" /> <location filename="../Preferences/ConfigurationDialog.py" line="235" /> @@ -7754,7 +7754,7 @@ <translation type="unfinished">Prohlížeč logu</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1104" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1111" /> <location filename="../Preferences/ConfigurationDialog.py" line="250" /> <source>MicroPython</source> <translation type="unfinished" /> @@ -7771,8 +7771,9 @@ <translation>Síť</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1111" /> - <location filename="../Preferences/ConfigurationDialog.py" line="958" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1118" /> + <location filename="../Preferences/ConfigurationDialog.py" line="965" /> + <location filename="../Preferences/ConfigurationDialog.py" line="806" /> <location filename="../Preferences/ConfigurationDialog.py" line="271" /> <source>Network Proxy</source> <translation type="unfinished">Použít síťovou proxy</translation> @@ -7783,13 +7784,13 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="927" /> + <location filename="../Preferences/ConfigurationDialog.py" line="934" /> <location filename="../Preferences/ConfigurationDialog.py" line="285" /> <source>PDF Viewer</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="965" /> + <location filename="../Preferences/ConfigurationDialog.py" line="972" /> <location filename="../Preferences/ConfigurationDialog.py" line="292" /> <source>Python Package Management</source> <translation type="unfinished" /> @@ -7800,7 +7801,7 @@ <translation>Plugin Manažer</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="806" /> + <location filename="../Preferences/ConfigurationDialog.py" line="813" /> <location filename="../Preferences/ConfigurationDialog.py" line="684" /> <location filename="../Preferences/ConfigurationDialog.py" line="306" /> <source>Printer</source> @@ -7817,13 +7818,13 @@ <translation>Qt</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="813" /> + <location filename="../Preferences/ConfigurationDialog.py" line="820" /> <location filename="../Preferences/ConfigurationDialog.py" line="321" /> <source>Security</source> <translation type="unfinished">Bezpečnost</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="996" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1003" /> <location filename="../Preferences/ConfigurationDialog.py" line="328" /> <source>Shell</source> <translation>Shell</translation> @@ -7839,7 +7840,7 @@ <translation>Šablony</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="865" /> + <location filename="../Preferences/ConfigurationDialog.py" line="872" /> <location filename="../Preferences/ConfigurationDialog.py" line="343" /> <source>Tray Starter</source> <translation type="unfinished" /> @@ -7855,7 +7856,7 @@ <translation>Debugger</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1003" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1010" /> <location filename="../Preferences/ConfigurationDialog.py" line="698" /> <location filename="../Preferences/ConfigurationDialog.py" line="399" /> <location filename="../Preferences/ConfigurationDialog.py" line="364" /> @@ -7890,14 +7891,14 @@ <translation>Manažer souborů</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1010" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1017" /> <location filename="../Preferences/ConfigurationDialog.py" line="712" /> <location filename="../Preferences/ConfigurationDialog.py" line="413" /> <source>Searching</source> <translation>Vyhledávání</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="848" /> + <location filename="../Preferences/ConfigurationDialog.py" line="855" /> <location filename="../Preferences/ConfigurationDialog.py" line="719" /> <location filename="../Preferences/ConfigurationDialog.py" line="648" /> <location filename="../Preferences/ConfigurationDialog.py" line="420" /> @@ -7905,7 +7906,7 @@ <translation>Kontrola pravopisu</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1017" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1024" /> <location filename="../Preferences/ConfigurationDialog.py" line="726" /> <location filename="../Preferences/ConfigurationDialog.py" line="427" /> <source>Style</source> @@ -7928,14 +7929,14 @@ <translation>Exportery</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1024" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1031" /> <location filename="../Preferences/ConfigurationDialog.py" line="455" /> <source>Autocompletion</source> <translation>Autodoplňování</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1045" /> - <location filename="../Preferences/ConfigurationDialog.py" line="1031" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1052" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1038" /> <location filename="../Preferences/ConfigurationDialog.py" line="483" /> <location filename="../Preferences/ConfigurationDialog.py" line="462" /> <source>QScintilla</source> @@ -7949,13 +7950,13 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1038" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1045" /> <location filename="../Preferences/ConfigurationDialog.py" line="476" /> <source>Calltips</source> <translation>Rychlé tipy</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1052" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1059" /> <location filename="../Preferences/ConfigurationDialog.py" line="740" /> <location filename="../Preferences/ConfigurationDialog.py" line="497" /> <source>Highlighters</source> @@ -7968,21 +7969,21 @@ <translation>Asociace typů souborů</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1059" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1066" /> <location filename="../Preferences/ConfigurationDialog.py" line="754" /> <location filename="../Preferences/ConfigurationDialog.py" line="511" /> <source>Styles</source> <translation>Styly</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1066" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1073" /> <location filename="../Preferences/ConfigurationDialog.py" line="761" /> <location filename="../Preferences/ConfigurationDialog.py" line="518" /> <source>Keywords</source> <translation>Klíčová slova</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1073" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1080" /> <location filename="../Preferences/ConfigurationDialog.py" line="768" /> <location filename="../Preferences/ConfigurationDialog.py" line="525" /> <source>Properties</source> @@ -7999,7 +8000,7 @@ <translation>Nápověda</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="820" /> + <location filename="../Preferences/ConfigurationDialog.py" line="827" /> <location filename="../Preferences/ConfigurationDialog.py" line="553" /> <source>Help Documentation</source> <translation>Dokumenty nápovědy</translation> @@ -8026,12 +8027,12 @@ <translation>Multiprojekt</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1136" /> - <location filename="../Preferences/ConfigurationDialog.py" line="1097" /> - <location filename="../Preferences/ConfigurationDialog.py" line="989" /> - <location filename="../Preferences/ConfigurationDialog.py" line="951" /> - <location filename="../Preferences/ConfigurationDialog.py" line="920" /> - <location filename="../Preferences/ConfigurationDialog.py" line="889" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1143" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1104" /> + <location filename="../Preferences/ConfigurationDialog.py" line="996" /> + <location filename="../Preferences/ConfigurationDialog.py" line="958" /> + <location filename="../Preferences/ConfigurationDialog.py" line="927" /> + <location filename="../Preferences/ConfigurationDialog.py" line="896" /> <location filename="../Preferences/ConfigurationDialog.py" line="792" /> <location filename="../Preferences/ConfigurationDialog.py" line="677" /> <location filename="../Preferences/ConfigurationDialog.py" line="602" /> @@ -8050,46 +8051,46 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="827" /> + <location filename="../Preferences/ConfigurationDialog.py" line="834" /> <location filename="../Preferences/ConfigurationDialog.py" line="627" /> <source>Appearance</source> <translation>Vzhled</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="834" /> - <location filename="../Preferences/ConfigurationDialog.py" line="634" /> - <source>eric Web Browser</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Preferences/ConfigurationDialog.py" line="841" /> + <location filename="../Preferences/ConfigurationDialog.py" line="634" /> + <source>eric Web Browser</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationDialog.py" line="848" /> <location filename="../Preferences/ConfigurationDialog.py" line="641" /> <source>VirusTotal Interface</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1228" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1235" /> <source>Enter search text...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1303" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1310" /> <source>Preferences</source> <translation>Předvolby</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1309" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1316" /> <source>Please select an entry of the list to display the configuration page.</source> <translation>Pro zobrazení strany s konfigurací vyberte položku ze seznamu.</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1392" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1399" /> <source>Configuration Page Error</source> <translation>Chyba na straně konfigurace</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1393" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1400" /> <source><p>The configuration page <b>{0}</b> could not be loaded.</p></source> <translation><p>Konfigurační stranu <b>{0}</b> nelze načíst.</p></translation> </message> @@ -10657,12 +10658,12 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="1691" /> + <location filename="../Debugger/DebuggerInterfacePython.py" line="1692" /> <source>Debug Protocol Error</source> <translation type="unfinished" /> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="1692" /> + <location filename="../Debugger/DebuggerInterfacePython.py" line="1693" /> <source><p>The response received from the debugger backend could not be decoded. Please report this issue with the received data to the eric bugs email address.</p><p>Error: {0}</p><p>Data:<br/>{1}</p></source> <translation type="unfinished" /> </message> @@ -22667,64 +22668,147 @@ </message> </context> <context> + <name>Fastexport</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="183" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="174" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="168" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="159" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="133" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="113" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="57" /> + <source>Mercurial Fastexport</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="58" /> + <source><p>The output file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="107" /> + <source>Cancel</source> + <translation type="unfinished">Zrušit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="110" /> + <source>%v/%m Changesets</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="116" /> + <source>Exporting repository (time remaining: {0}) ...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="134" /> + <source><p>The repository fastexport process sent an error message.</p><p>{0}</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="160" /> + <source><p>The repository fastexport process finished successfully.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="169" /> + <source><p>The repository fastexport process was cancelled.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="175" /> + <source><p>The repository fastexport process finished with exit code <b>{0}</b>.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="184" /> + <source><p>The repository fastexport process crashed.</p></source> + <translation type="unfinished" /> + </message> + </context> + <context> + <name>FastexportProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="37" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="35" /> + <source>Export to git</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="44" /> + <source>Export the repository as git fast-import stream.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="47" /> + <source><b>Export to git</b><p>This exports the repository as a git fast-import stream.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="79" /> + <source>Fastexport</source> + <translation type="unfinished" /> + </message> + </context> + <context> <name>FeaturePermissionBar</name> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="48" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="50" /> <source>{0} wants to use your position.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="51" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="53" /> <source>{0} wants to use your microphone.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="54" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="56" /> <source>{0} wants to use your camera.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="57" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="59" /> <source>{0} wants to use your microphone and camera.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="60" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="62" /> <source>{0} wants to lock your mouse.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="61" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="63" /> <source>{0} wants to capture video of your screen.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="64" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="66" /> <source>{0} wants to capture audio and video of your screen.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="67" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="69" /> <source>{0} wants to use desktop notifications.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="92" /> - <source>Remember</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="94" /> + <source>Remember</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="96" /> <source>Allow</source> <translation type="unfinished">Povolit</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="95" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="97" /> <source>Deny</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="120" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="122" /> <source>{0} wants to use an unknown feature.</source> <translation type="unfinished" /> </message> @@ -22732,80 +22816,106 @@ <context> <name>FeaturePermissionsDialog</name> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="161" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="143" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="127" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="109" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="93" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="79" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="65" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="49" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="208" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="190" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="170" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="152" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="136" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="118" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="102" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="88" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="74" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="58" /> <source>Host</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="162" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="144" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="128" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="110" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="94" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="80" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="66" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="50" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="209" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="191" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="171" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="153" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="137" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="119" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="103" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="89" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="75" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="59" /> <source>Permission</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="54" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="63" /> <source>Notifications</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="68" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="77" /> <source>Geolocation</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="82" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="91" /> <source>Microphone</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="96" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="105" /> <source>Camera</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="114" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="123" /> <source>Microphone && Camera</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="130" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="139" /> <source>Mouse Lock</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="148" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="157" /> <source>Desktop Video</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="166" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="175" /> <source>Desktop Audio && Video</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="181" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="195" /> + <source>Clipboard</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="213" /> + <source>Local Fonts</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="296" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="253" /> <source>Allow</source> <translation type="unfinished">Povolit</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="182" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="297" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="254" /> <source>Deny</source> <translation type="unfinished" /> </message> <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="255" /> + <source>Always Ask</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="256" /> + <source>Invalid</source> + <translation type="unfinished" /> + </message> + <message> <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.ui" line="0" /> <source>HTML5 Feature Permissions</source> <translation type="unfinished" /> @@ -24676,74 +24786,74 @@ <translation type="unfinished" /> </message> <message> - <location filename="../UI/FindFileWidget.py" line="750" /> + <location filename="../UI/FindFileWidget.py" line="749" /> <source>Invalid search expression</source> <translation type="unfinished">Neplatný výraz hledání</translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="751" /> + <location filename="../UI/FindFileWidget.py" line="750" /> <source><p>The search expression is not valid.</p><p>Error: {0}</p></source> <translation type="unfinished"><p>Výraz hledná není platný. </p><p>Chyba: {0}</p></translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="878" /> + <location filename="../UI/FindFileWidget.py" line="877" /> <source>{0} / {1}</source> <comment>occurrences / files</comment> <translation type="unfinished" /> </message> <message numerus="yes"> - <location filename="../UI/FindFileWidget.py" line="881" /> + <location filename="../UI/FindFileWidget.py" line="880" /> <source>%n occurrence(s)</source> <translation type="unfinished"> <numerusform /> </translation> </message> <message numerus="yes"> - <location filename="../UI/FindFileWidget.py" line="882" /> + <location filename="../UI/FindFileWidget.py" line="881" /> <source>%n file(s)</source> <translation type="unfinished"> <numerusform /> </translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1081" /> - <location filename="../UI/FindFileWidget.py" line="1056" /> - <location filename="../UI/FindFileWidget.py" line="1042" /> + <location filename="../UI/FindFileWidget.py" line="1080" /> + <location filename="../UI/FindFileWidget.py" line="1055" /> + <location filename="../UI/FindFileWidget.py" line="1041" /> <source>Replace in Files</source> <translation type="unfinished">Nahradit v souborech</translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1043" /> + <location filename="../UI/FindFileWidget.py" line="1042" /> <source><p>Could not read the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation type="unfinished"><p>Nelze číst ze souboru <b>{0}</b>. Přeskočeno.</p><p>Důvod: {1}</p></translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1057" /> + <location filename="../UI/FindFileWidget.py" line="1056" /> <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 type="unfinished" /> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1082" /> + <location filename="../UI/FindFileWidget.py" line="1081" /> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation type="unfinished"><p>Nelze uložit do souboru <b>{0}</b>. Přeskočeno.</p><p>Důvod: {1}</p></translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1111" /> + <location filename="../UI/FindFileWidget.py" line="1110" /> <source>Open</source> <translation type="unfinished">Otevřít</translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1113" /> + <location filename="../UI/FindFileWidget.py" line="1112" /> <source>Copy Path to Clipboard</source> <translation type="unfinished">Kopírovat cestu do schránky</translation> </message> <message> + <location filename="../UI/FindFileWidget.py" line="1116" /> + <source>Select All</source> + <translation type="unfinished">Vybrat vše</translation> + </message> + <message> <location filename="../UI/FindFileWidget.py" line="1117" /> - <source>Select All</source> - <translation type="unfinished">Vybrat vše</translation> - </message> - <message> - <location filename="../UI/FindFileWidget.py" line="1118" /> <source>Deselect All</source> <translation type="unfinished" /> </message> @@ -26919,37 +27029,37 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="91" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="94" /> <source>Additional Output</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="110" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="113" /> <source>Process canceled.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="124" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="127" /> <source>Process finished successfully.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="126" /> - <source>Process crashed.</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="129" /> + <source>Process crashed.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="132" /> <source>Process finished with exit code {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="195" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="198" /> <source>Process Generation Error</source> <translation type="unfinished">Chyba v procesu generování</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="196" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="199" /> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> @@ -35320,456 +35430,456 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="303" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="309" /> <source>Create project repository</source> <translation>Vytvořit repozitář projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="304" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="310" /> <source>The project repository could not be created.</source> <translation>Úložiště projektu nelze vytvořit.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="338" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="344" /> <source>Creating Mercurial repository</source> <translation>Vytváření Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="359" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="365" /> <source>Initial commit to Mercurial repository</source> <translation>Úvodní zápis změn (commit) do Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="405" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="411" /> <source>Cloning project from a Mercurial repository</source> <translation>Naklonovat projekt z Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="516" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="522" /> <source>Commit Changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="517" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="523" /> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="580" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="586" /> <source>Committing changes to Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="679" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="685" /> <source>Synchronizing with the Mercurial repository</source> <translation>Synchronizovat s Mercurial úložištěm</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="719" /> <source>Adding files/directories to the Mercurial repository</source> <translation>Přidat soubory/složky do Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="774" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="780" /> <source>Removing files/directories from the Mercurial repository</source> <translation>Odebrat soubory/složky z Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="829" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="835" /> <source>Renaming {0}</source> <translation>Přejmenování {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="964" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="970" /> <source>Tagging in the Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1011" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1000" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1017" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006" /> <source>Revert changes</source> <translation type="unfinished">Vrátit změny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1001" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1007" /> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1012" /> - <source>Do you really want to revert all changes of the project?</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1018" /> + <source>Do you really want to revert all changes of the project?</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1024" /> <source>Reverting changes</source> <translation>Navrácení změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1064" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1070" /> <source>Merging</source> <translation>Merging</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1095" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1109" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101" /> <source>Re-Merge</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1102" /> <source>Do you really want to re-merge these files or directories?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1104" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1110" /> <source>Do you really want to re-merge the project?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1114" /> <source>Re-Merging</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1131" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1137" /> <source>Current branch tip</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1314" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1320" /> <source>Mercurial command</source> <translation>Mercurial příkaz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1492" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1498" /> <source>Copying {0}</source> <translation>Kopírování {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1758" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1746" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1764" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1752" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743" /> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1759" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1765" /> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"><p>Soubor <b>{0}</b> nelze přečíst.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2457" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2446" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2436" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1835" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2455" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844" /> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1838" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1847" /> <source>Pulling from a remote Mercurial repository</source> <translation>Stažení (pull) z Mercurial repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1884" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1893" /> <source>Pushing to a remote Mercurial repository</source> <translation>Odeslání (push) do Mercurial repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2027" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2036" /> <source>Marking as 'unresolved'</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2029" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038" /> <source>Marking as 'resolved'</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2051" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060" /> <source>Aborting uncommitted merge</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2084" /> <source>Creating branch in the Mercurial repository</source> <translation>Vytvoření větve v Mercurial repozitáři</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086" /> - <source>Created new branch <{0}>.</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2095" /> + <source>Created new branch <{0}>.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2104" /> <source>Showing current branch</source> <translation>Zobrazení aktuální větve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2184" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193" /> <source>Verifying the integrity of the Mercurial repository</source> <translation>Ověřit integritu Mercurial repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2200" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209" /> <source>Showing the combined configuration settings</source> <translation>Zobrazení nastavení kombinovaných konfigurací</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2224" /> <source>Showing aliases for remote repositories</source> <translation>Zobrazení aliasů pro vzdálené úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2230" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239" /> <source>Recovering from interrupted transaction</source> <translation>Obnovení z přerušené transakce</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254" /> <source>Identifying project directory</source> <translation>Rozpoznat složku projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2291" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2300" /> <source>Create .hgignore file</source> <translation>Vytvořit soubor .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2292" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301" /> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2395" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2369" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2351" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2404" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2378" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2360" /> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2353" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362" /> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Soubory Mercurial skupiny změn (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2370" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2379" /> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2409" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2418" /> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2438" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2411" /> - <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> - <translation>Soubory Mercurial skupiny změn (*.hg);;Všechny soubory (*)</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2447" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2420" /> + <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> + <translation>Soubory Mercurial skupiny změn (*.hg);;Všechny soubory (*)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2456" /> <source>Shall the working directory be updated?</source> <translation>Má být pracovní adresář aktualizován?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2479" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2488" /> <source>Bisect subcommand ({0}) invalid.</source> <translation>Neplatný bisect podpříkaz ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2501" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2510" /> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2527" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2536" /> <source>Removing files from the Mercurial repository only</source> <translation>Odebrat soubory jen z Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2576" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2557" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2585" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2566" /> <source>Backing out changeset</source> <translation>Zálohovat skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2558" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2567" /> <source>No revision given. Aborting...</source> <translation>Nebyla dána žádná revize. Ruším...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2587" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2602" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2596" /> <source>Rollback last transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2588" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2597" /> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2657" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2666" /> <source>Import Patch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2707" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2716" /> <source>Export Patches</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2749" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2758" /> <source>Change Phase</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2804" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813" /> <source>Copy Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2843" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2852" /> <source>Copy Changesets (Continue)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2853" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2862" /> <source>Copy Changesets (Stop)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2863" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2872" /> <source>Copy Changesets (Abort)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2887" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2896" /> <source>Create Unversioned Archive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2902" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2911" /> <source>Delete All Backups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2903" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2912" /> <source><p>Do you really want to delete all backup bundles stored in the backup area?<br/><b>{0}</b></p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2994" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2974" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2963" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2983" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2972" /> <source>Add Sub-repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3033" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2964" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3042" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2973" /> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2975" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2984" /> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3051" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3060" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3004" /> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3050" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3032" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3018" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3059" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3027" /> <source>Remove Sub-repositories</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3019" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3028" /> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3296" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3138" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3147" /> <source>Mercurial Command Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3139" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3148" /> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3297" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3321" /> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3420" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3444" /> <source>Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3437" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3461" /> <source>Delete Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3438" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3462" /> <source>Select the bookmark to be deleted:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3449" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3473" /> <source>Delete Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3476" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3500" /> <source>Rename Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3518" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3542" /> <source>Move Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3600" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3624" /> <source>Pull Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3601" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3625" /> <source>Select the bookmark to be pulled:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3613" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3637" /> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3641" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3665" /> <source>Push Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3642" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3666" /> <source>Select the bookmark to be push:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3657" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3681" /> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished" /> </message> @@ -36612,42 +36722,42 @@ <context> <name>HgClient</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="98" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="100" /> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="147" /> - <source>Did not receive the 'hello' message.</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="149" /> + <source>Did not receive the 'hello' message.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="151" /> <source>Received data on unexpected channel.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="154" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="156" /> <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="159" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="161" /> <source>'capabilities' message did not contain any capability.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="168" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="170" /> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="173" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="175" /> <source>'encoding' message did not contain any encoding.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="385" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="387" /> <source>For message see output dialog.</source> <translation type="unfinished" /> </message> @@ -37009,6 +37119,11 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="0" /> + <source>%v/%m</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="0" /> <source>Errors</source> <translation>Chyby</translation> </message> @@ -37052,6 +37167,11 @@ <source>Alt+P</source> <translation type="unfinished" /> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="211" /> + <source>Time remaining: {0}</source> + <translation type="unfinished" /> + </message> </context> <context> <name>HgDiffDialog</name> @@ -37231,6 +37351,69 @@ </message> </context> <context> + <name>HgFastexportConfigDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>fastexport Configuration</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the path of the file for the exported marks.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the path of the output file.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Revisions:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the path of the file containing already exported marks.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Author Map:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Import Marks:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Export Marks:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Output File:</source> + <translation type="unfinished">Výstupní soubor:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the revisions, tags or branches to be exported (separated by comma).</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the path of the author map file.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.py" line="42" /> + <source>Text Files (*.txt);;All Files (*)</source> + <translation type="unfinished">Textové soubory (*.txt);;Všechny soubory (*)</translation> + </message> + </context> + <context> <name>HgGpgSignDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="0" /> @@ -38042,7 +38225,7 @@ <translation type="unfinished">Pohled</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3049" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3063" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298" /> <source>Select Branches</source> <translation type="unfinished" /> @@ -38083,7 +38266,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2218" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2227" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> <source>Copy Changesets</source> <translation type="unfinished" /> @@ -38140,8 +38323,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2312" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2295" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2321" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2304" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="387" /> <source>Switch</source> <translation type="unfinished">Přepnout</translation> @@ -38172,263 +38355,270 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2430" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1622" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="415" /> - <source>Pull Changes</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="418" /> - <source>Pull changes from a remote repository</source> - <translation type="unfinished">Stáhnout změny (pull) ze vzdáleného repozitáře</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="420" /> + <source>Pull Selected Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="419" /> + <source>Pull selected changes from a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="423" /> + <source>Pull All Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="427" /> + <source>Pull all changes from a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="430" /> <source>Pull Large Files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="422" /> - <source>Pull large files for selected revisions</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="428" /> - <source>Push Selected Changes</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="432" /> - <source>Push changes of the selected changeset and its ancestors to a remote repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="439" /> - <source>Push All Changes</source> + <source>Pull large files for selected revisions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="438" /> + <source>Push Selected Changes</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="442" /> - <source>Push all changes to a remote repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="448" /> - <source>Create Changegroup</source> + <source>Push changes of the selected changeset and its ancestors to a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="449" /> + <source>Push All Changes</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="452" /> + <source>Push all changes to a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="458" /> + <source>Create Changegroup</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="462" /> <source>Create a changegroup file containing the selected changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="455" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="465" /> <source><b>Create Changegroup</b> <p>This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2569" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="468" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2583" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="478" /> <source>Apply Changegroup</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="472" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="482" /> <source>Apply the currently viewed changegroup file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="489" /> <source>Sign Revisions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="483" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="493" /> <source>Add a signature for the selected revisions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="487" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="497" /> <source>Verify Signatures</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="491" /> - <source>Verify all signatures there may be for the selected revision</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2476" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498" /> - <source>Strip Changesets</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="501" /> + <source>Verify all signatures there may be for the selected revision</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="508" /> + <source>Strip Changesets</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="511" /> <source>Strip changesets from a repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="506" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="516" /> <source>Select All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="509" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="519" /> <source>Deselect All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="958" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="934" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="911" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="885" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="968" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="944" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="921" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="895" /> <source>Mercurial Error</source> <translation>Mercurial chyba</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1266" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1276" /> <source>{0} (large file)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1532" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1542" /> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1543" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1553" /> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1701" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1620" /> - <source>Pull Selected Changes</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2570" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2477" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2431" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2313" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2219" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2584" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2491" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2322" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2228" /> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Projekt bude znovu načten. Má se provést?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2296" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2305" /> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2341" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2350" /> <source>Define Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2342" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2351" /> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2371" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2380" /> <source>Move Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2372" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2381" /> <source>Select the bookmark to be moved to changeset '{0}':</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2444" /> + <source>Pull Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2727" /> <source>Find Commit</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2714" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728" /> <source>'{0}' was not found.</source> <translation type="unfinished">'{0}' nebyl nalezen.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2774" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2788" /> <source>Generating differences ...</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2775" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2789" /> <source>Differences</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2794" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2808" /> <source>No differences available. Get some more log entries.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2796" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2810" /> <source>No differences available.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2807" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2821" /> <source>Differences to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2823" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2837" /> <source>Diff to Parent {0}{1}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2846" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2860" /> <source>There is no difference.</source> <translation type="unfinished">Žádné rozdíly nebyly nalezeny.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2999" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2983" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2965" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3013" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2997" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2979" /> <source>Save Diff</source> <translation type="unfinished">Uložit Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2967" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2981" /> <source>Patch Files (*.diff)</source> <translation type="unfinished">Patch soubory (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2984" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2998" /> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3000" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3014" /> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation type="unfinished"><p>Patch soubor <b>{0}</b> nelze uložit.<br />Důvod: {1}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3031" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3045" /> <source>closed</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3032" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3046" /> <source>inactive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3041" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3055" /> <source>{0} ({1})</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3050" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3064" /> <source>Select the branches to be shown (none for 'All'):</source> <translation type="unfinished" /> </message> @@ -38577,6 +38767,10 @@ <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation><b>Mercurial log chyb</b><p>Zobrazí možné chyby z příkazu hg log.</p></translation> </message> + <message> + <source>Pull changes from a remote repository</source> + <translation type="vanished">Stáhnout změny (pull) ze vzdáleného repozitáře</translation> + </message> </context> <context> <name>HgMergeDialog</name> @@ -38937,208 +39131,213 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="282" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="309" /> + <source>Other Functions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="335" /> <source>Extensions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="718" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="604" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="556" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="451" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="308" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="774" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="659" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="611" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="505" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="361" /> <source>Version Control</source> <translation>Kontrola verzí</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="734" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="620" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="467" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="324" /> - <source>Commit changes to repository...</source> - <translation>Zapsat změny do repozitáře...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="742" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="628" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="475" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="332" /> - <source>Add to repository</source> - <translation>Přidat do repozitáře</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="748" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="481" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="338" /> - <source>Remove from repository (and disk)</source> - <translation>Odebrat z repozitáře (a z disku)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1012" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="999" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="487" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="344" /> - <source>Remove from repository only</source> - <translation>Odebrat jen z repozitáře</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="639" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="349" /> - <source>Copy</source> - <translation type="unfinished">Kopírovat</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="641" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="351" /> - <source>Move</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="646" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="356" /> - <source>Show log browser</source> - <translation>Zobrazit log prohlížeč</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="755" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="653" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="494" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="363" /> - <source>Show status</source> - <translation>Zobrazit status</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="762" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="660" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="501" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="370" /> - <source>Show differences</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="376" /> - <source>Show differences side-by-side</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="768" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="666" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="507" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="382" /> - <source>Show differences (extended)</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="388" /> - <source>Show differences side-by-side (extended)</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="394" /> - <source>Show annotated file</source> - <translation>Zobrazit komentované soubory</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="398" /> - <source>Show annotated file with skip list</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="402" /> - <source>Create skip list file</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="775" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="673" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="514" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="408" /> - <source>Revert changes</source> - <translation>Vrátit změny</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="779" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="677" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="518" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="412" /> - <source>Conflicts resolved</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="781" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="679" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="520" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="414" /> - <source>Conflicts unresolved</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="783" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="681" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="522" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="416" /> - <source>Re-Merge</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="787" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="685" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="571" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="526" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="420" /> - <source>Select all local file entries</source> - <translation>Vybrat všechny lokální soubory</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="790" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="688" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="574" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="529" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="423" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="675" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="521" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="377" /> + <source>Commit changes to repository...</source> + <translation>Zapsat změny do repozitáře...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="799" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="684" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="530" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="386" /> + <source>Add to repository</source> + <translation>Přidat do repozitáře</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="805" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="690" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="536" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="392" /> + <source>Remove from repository (and disk)</source> + <translation>Odebrat z repozitáře (a z disku)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1069" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1056" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="542" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="398" /> + <source>Remove from repository only</source> + <translation>Odebrat jen z repozitáře</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="695" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="403" /> + <source>Copy</source> + <translation type="unfinished">Kopírovat</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="697" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="405" /> + <source>Move</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="702" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="410" /> + <source>Show log browser</source> + <translation>Zobrazit log prohlížeč</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="812" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="709" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="549" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="417" /> + <source>Show status</source> + <translation>Zobrazit status</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="819" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="716" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="556" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="424" /> + <source>Show differences</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="430" /> + <source>Show differences side-by-side</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="825" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="722" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="562" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="436" /> + <source>Show differences (extended)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="442" /> + <source>Show differences side-by-side (extended)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="448" /> + <source>Show annotated file</source> + <translation>Zobrazit komentované soubory</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="452" /> + <source>Show annotated file with skip list</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="456" /> + <source>Create skip list file</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="832" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="729" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="569" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="462" /> + <source>Revert changes</source> + <translation>Vrátit změny</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="836" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="733" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="573" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="466" /> + <source>Conflicts resolved</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="735" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="575" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="468" /> + <source>Conflicts unresolved</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="840" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="737" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="577" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="470" /> + <source>Re-Merge</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="844" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="741" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="581" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="474" /> + <source>Select all local file entries</source> + <translation>Vybrat všechny lokální soubory</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="847" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="744" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="629" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="584" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="477" /> <source>Select all versioned file entries</source> <translation>Vybrat všechny soubory ve správě verzí</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="793" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="691" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="577" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="532" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="426" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="850" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="747" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="632" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="587" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="480" /> <source>Select all local directory entries</source> <translation>Vybrat všechny lokální adresáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="797" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="695" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="581" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="536" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="430" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="854" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="751" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="591" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="484" /> <source>Select all versioned directory entries</source> <translation>Vybrat všechny adresáře ve správě verzí</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="801" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="699" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="585" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="540" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="434" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="858" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="755" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="640" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="595" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="488" /> <source>Configure...</source> <translation type="unfinished">Konfigurovat...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="916" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="973" /> <source>Create {0} file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="917" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="974" /> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished"><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1013" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1000" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1070" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1057" /> <source>Do you really want to remove these files from the repository?</source> <translation>Opravdu chcete odebrat tyto soubory z repozitáře?</translation> </message> @@ -39146,1513 +39345,1518 @@ <context> <name>HgProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="126" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="135" /> <source>New from repository</source> <translation>Nový z repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="128" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="137" /> <source>&New from repository...</source> <translation>&Nový z repozitáře...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="135" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="144" /> <source>Create (clone) a new project from a Mercurial repository</source> <translation>Naklonovat projekt z Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="138" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="147" /> <source><b>New from repository</b><p>This creates (clones) a new local project from a Mercurial repository.</p></source> <translation><b>Nový z repozitáře</b><p>Vytvoří nový lokální projekt z Mercurial repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="150" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="148" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="159" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="157" /> <source>Show incoming log</source> <translation>Zobrazit příchozí logy</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="156" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="165" /> <source>Show the log of incoming changes</source> <translation>Zobrazit log přichozích změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="158" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="167" /> <source><b>Show incoming log</b><p>This shows the log of changes coming into the repository.</p></source> <translation><b>Zobrazit příchozí log</b><p>Toto zobrazí log se změnami přicházejícími z repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="170" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="168" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="179" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="177" /> <source>Pull changes</source> <translation>Stáhnout změny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="176" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="185" /> <source>Pull changes from a remote repository</source> <translation>Stáhnout změny (pull) ze vzdáleného repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="178" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="187" /> <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository.</p></source> <translation><b>Stáhnoput změny</b><p>Přikaz pull stáhne změny ze vzdáleného repozitáře a začlení je do lokálního repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="188" /> - <source>Update from repository</source> - <translation>Obnovit z repozitáře</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="190" /> - <source>&Update from repository</source> - <translation>&Update: obnovit z repozitáře</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="197" /> + <source>Update from repository</source> + <translation>Obnovit z repozitáře</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="199" /> + <source>&Update from repository</source> + <translation>&Update: obnovit z repozitáře</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="206" /> <source>Update the local project from the Mercurial repository</source> <translation>Obnovit lokální projekt z Mercurial repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="200" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="209" /> <source><b>Update from repository</b><p>This updates the local project from the Mercurial repository.</p></source> <translation><b>Obnovit z repozitáře</b><p>Obnoví lokální projekt z Mercurial repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="210" /> - <source>Commit changes to repository</source> - <translation>Zapsat změny do repozitáře</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="212" /> - <source>&Commit changes to repository...</source> - <translation>&Zapsat změny do repozitáře...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="219" /> + <source>Commit changes to repository</source> + <translation>Zapsat změny do repozitáře</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="221" /> + <source>&Commit changes to repository...</source> + <translation>&Zapsat změny do repozitáře...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="228" /> <source>Commit changes to the local project to the Mercurial repository</source> <translation>Zápis změn (commit) do lokálního Mercurial repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="231" /> <source><b>Commit changes to repository</b><p>This commits changes to the local project to the Mercurial repository.</p></source> <translation><b>Zápis změn do repozitáře (commit)</b><p>Uloží změny v projektu do lokálního Mercurial repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="234" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="232" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="243" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="241" /> <source>Show outgoing log</source> <translation>Zobrazit odchozí logy</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="240" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="249" /> <source>Show the log of outgoing changes</source> <translation>Zobrazit log odchozích změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="242" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251" /> <source><b>Show outgoing log</b><p>This shows the log of changes outgoing out of the repository.</p></source> <translation><b>Zobrazit odchozí log</b><p>Toto zobrazí log se změnami odcházejícími z repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="254" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="252" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261" /> <source>Push changes</source> <translation>Předat změny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="260" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="269" /> <source>Push changes to a remote repository</source> <translation>Předat změny do vzdáleného repozitáře (push)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="262" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271" /> <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> <translation><b>Předat změny (push)</b><p>Přikaz push předá změny z lokálního repozitáře do vzdáleného repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="274" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="272" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281" /> <source>Push changes (force)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="290" /> <source>Push changes to a remote repository with force option</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="284" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293" /> <source><b>Push changes (force)</b><p>This pushes changes from the local repository to a remote repository using the 'force' option.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="294" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="303" /> <source>Export from repository</source> <translation>Exportovat z repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="296" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="305" /> <source>&Export from repository...</source> <translation>&Exportovat z repozitáře...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="302" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="311" /> <source>Export a project from the repository</source> <translation>Export projekt z repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="313" /> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation><b>Exportovat z repozitáře</b><p>Exportuje projekt z repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="313" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="324" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322" /> <source>Show log browser</source> <translation>Zobrazit log prohlížeč</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="331" /> <source>Show a dialog to browse the log of the local project</source> <translation>Zobrazit dialog pro procházení logů lokálního projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="334" /> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation><b>Zobrazit log prohlížeč</b><p>Zobrazí se dialogové okno pro procházení logů lokálního projektu. Jako první je zobrazen limit maximálního přenosu. Více záznamů může být zobrazeno později.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="336" /> - <source>Show differences</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="338" /> - <source>Show &difference</source> - <translation>Zobrazit o&dlišnosti</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="345" /> + <source>Show differences</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347" /> + <source>Show &difference</source> + <translation>Zobrazit o&dlišnosti</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="354" /> <source>Show the difference of the local project to the repository</source> <translation>Zobrazí odlišnosti mezi lokálním projektem a repozitářem</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="357" /> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="360" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="358" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="369" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="367" /> <source>Show differences (extended)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="367" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376" /> <source>Show the difference of revisions of the project to the repository</source> <translation>Zobrazí odlišnosti mezi revizemi projektu v repozitáři</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="370" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379" /> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="380" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389" /> <source>Show status</source> <translation>Zobrazit status</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="391" /> <source>Show &status...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="397" /> <source>Show the status of the local project</source> <translation>Zobrazit status lokálního projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390" /> - <source><b>Show status</b><p>This shows the status of the local project.</p></source> - <translation><b>Zobrazit status</b><p>Zobrazí status lokálního projektu.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="399" /> - <source>Show Summary</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="401" /> - <source>Show summary...</source> - <translation type="unfinished" /> + <source><b>Show status</b><p>This shows the status of the local project.</p></source> + <translation><b>Zobrazit status</b><p>Zobrazí status lokálního projektu.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408" /> + <source>Show Summary</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="410" /> + <source>Show summary...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="417" /> <source>Show summary information of the working directory status</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="411" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420" /> <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="430" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="430" /> <source>Show heads</source> <translation>Zobrazit hlavy</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="432" /> <source>Show the heads of the repository</source> <translation>Zobrazit ukazatele hlav repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="425" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="434" /> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation><b>Zobrazit ukazatele hlav</b><p>Zobrazí ukazatele hlav repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="434" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="443" /> <source>Show parents</source> <translation>Zobrazit předky</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="441" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450" /> <source>Show the parents of the repository</source> <translation>Zobrazit předky repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="443" /> - <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> - <translation><b>Zobrazit předky</b><p>Zobrazí předky repozitáře.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="452" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="452" /> + <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> + <translation><b>Zobrazit předky</b><p>Zobrazí předky repozitáře.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461" /> <source>Show tip</source> <translation>Zobrazit ukazatel tip</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="463" /> <source>Show the tip of the repository</source> <translation>Zobrazí ukazatel tip repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="456" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="465" /> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation><b>Zobrazit ukazatele tip</b><p>Zobrazí ukazatele tip repozitáře.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462" /> - <source>Revert changes</source> - <translation>Vrátit změny</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464" /> - <source>Re&vert changes</source> - <translation>&Vrátit změny</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471" /> + <source>Revert changes</source> + <translation>Vrátit změny</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="473" /> + <source>Re&vert changes</source> + <translation>&Vrátit změny</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="480" /> <source>Revert all changes made to the local project</source> <translation>Vrátit všechny změny, které byly provedeny v lokálním projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483" /> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation><b>Vrátit změny</b><p>Vrátí se všechny změny, které byly provedeny v lokálním projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2110" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2129" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492" /> <source>Merge</source> <translation>Sloučit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="485" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494" /> <source>Mer&ge changes...</source> <translation>&Sloučit změny...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501" /> <source>Merge changes of a revision into the local project</source> <translation>Sloučí změny revize do lokálního projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="495" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="504" /> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation><b>Sloučit</b><p>Sloučí se změny revize do lokálního projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="506" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505" /> - <source>Commit Merge</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512" /> - <source>Commit all the merged changes.</source> - <translation type="unfinished" /> - </message> - <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="515" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514" /> - <source><b>Commit a merge</b><p>This commits a merge working directory</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524" /> + <source>Commit Merge</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521" /> + <source>Commit all the merged changes.</source> + <translation type="unfinished" /> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="523" /> + <source><b>Commit a merge</b><p>This commits a merge working directory</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="533" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="532" /> <source>Abort Merge</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="531" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540" /> <source>Abort an uncommitted merge and lose all changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="543" /> <source><b>Abort uncommitted merge</b><p>This aborts an uncommitted merge causing all changes to be lost.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="546" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="544" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="553" /> <source>Re-Merge</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="553" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="562" /> <source>Re-Merge all conflicting, unresolved files of the project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="556" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="565" /> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="575" /> <source>Show conflicts</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="576" /> <source>Show conflicts...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="583" /> <source>Show a dialog listing all files with conflicts</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586" /> <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596" /> <source>Conflicts resolved</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="597" /> <source>Con&flicts resolved</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604" /> <source>Mark all conflicts of the local project as resolved</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="607" /> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617" /> <source>Conflicts unresolved</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625" /> <source>Mark all conflicts of the local project as unresolved</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628" /> <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638" /> <source>Tag in repository</source> <translation>Vytvořit tag v repozitáři</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640" /> <source>&Tag in repository...</source> <translation>Vytvořit &tag v repozitáři...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="637" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646" /> <source>Tag the local project in the repository</source> <translation>Vytvořit Tag - značku z lokálního projektu do repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="639" /> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation><b>Vytvořit tag v repozitáři</b><p>Z lokálního projektu vytvoří značku - tag v repozitáři.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648" /> - <source>List tags</source> - <translation>Seznam tagů</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="649" /> - <source>List tags...</source> - <translation>Seznam tagů...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655" /> - <source>List tags of the project</source> - <translation>Seznam tagů projektu</translation> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation><b>Vytvořit tag v repozitáři</b><p>Z lokálního projektu vytvoří značku - tag v repozitáři.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657" /> - <source><b>List tags</b><p>This lists the tags of the project.</p></source> - <translation><b>Seznam tagů</b><p>Zobrazí seznam tagů projektu.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663" /> - <source>List branches</source> - <translation>Seznam větví</translation> + <source>List tags</source> + <translation>Seznam tagů</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="658" /> + <source>List tags...</source> + <translation>Seznam tagů...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="664" /> - <source>List branches...</source> - <translation>Seznam větví...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670" /> - <source>List branches of the project</source> - <translation>Seznam větví projektu</translation> + <source>List tags of the project</source> + <translation>Seznam tagů projektu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666" /> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <translation><b>Seznam tagů</b><p>Zobrazí seznam tagů projektu.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672" /> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation><b>Seznam větví</b><p>Zobrazí seznam větví projektu.</p></translation> + <source>List branches</source> + <translation>Seznam větví</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673" /> + <source>List branches...</source> + <translation>Seznam větví...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="679" /> + <source>List branches of the project</source> + <translation>Seznam větví projektu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681" /> - <source>Create branch</source> - <translation>Vytvořit větev</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="683" /> - <source>Create &branch...</source> - <translation>Narou&bovat větev...</translation> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation><b>Seznam větví</b><p>Zobrazí seznam větví projektu.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="690" /> + <source>Create branch</source> + <translation>Vytvořit větev</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692" /> + <source>Create &branch...</source> + <translation>Narou&bovat větev...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699" /> <source>Create a new branch for the local project in the repository</source> <translation>Vytvořit v repoziáři novou větev pro lokální projekt</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="693" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="702" /> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation><b>Vytvořit větev</b><p>V repozitáři se vytvoří nová větev v lokálním projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712" /> <source>Push new branch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721" /> <source>Push the current branch of the local project as a new named branch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="717" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726" /> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="738" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736" /> <source>Close branch</source> <translation>Zavřít větev</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="745" /> <source>Close the current branch of the local project</source> <translation>Zavře aktuální větev v lokálním projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748" /> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation><b>Zavřít větev</b><p>Zavře aktuální větev v lokálním projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="758" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757" /> <source>Show current branch</source> <translation>Zobrazit aktuální větev</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="756" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765" /> <source>Show the current branch of the project</source> <translation>Zobrazit aktuální větev projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="759" /> - <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> - <translation><b>Zobrazit aktuální větev</b><p>Zobrazí se aktuální větev projektu.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768" /> - <source>Switch</source> - <translation>Přepnout</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770" /> - <source>S&witch...</source> - <translation>&Přepnout...</translation> + <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> + <translation><b>Zobrazit aktuální větev</b><p>Zobrazí se aktuální větev projektu.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777" /> + <source>Switch</source> + <translation>Přepnout</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="779" /> + <source>S&witch...</source> + <translation>&Přepnout...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786" /> <source>Switch the working directory to another revision</source> <translation>Přepnout pracovní adresář do jiné revize</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="780" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="789" /> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation><b>Přepnout</b><p>Přepne pracovní adresář do jiné revize.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799" /> <source>Cleanup</source> <translation>Vyčistit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799" /> <source>Cleanu&p</source> <translation>Vy&prat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="792" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801" /> <source>Cleanup the local project</source> <translation>Vyčistit lokální projekt</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794" /> - <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> - <translation><b>Vyčistit</b><p>Provede úklid lokálního projektu.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="803" /> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation><b>Vyčistit</b><p>Provede úklid lokálního projektu.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="812" /> <source>Execute command</source> <translation>Provést příkaz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813" /> <source>E&xecute command...</source> <translation>P&rovést příkaz...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="811" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="820" /> <source>Execute an arbitrary Mercurial command</source> <translation>Spustit libovolný Mercurial příkaz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="814" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="823" /> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation><b>Provést příkaz</b><p>Otevře se dialogové okno pro zadání libovolného Mercurial příkazu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="824" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833" /> <source>Configure</source> <translation>Konfigurovat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="834" /> <source>Configure...</source> <translation>Konfigurovat...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="841" /> <source>Show the configuration dialog with the Mercurial page selected</source> <translation>Zobrazit konfigurační dialog s vybranou Mercurial stranou</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="835" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="844" /> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation><b>Konfigurovat</b><p>Zobrazit konfigurační dialog s vybranou Mercurial stranou.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854" /> <source>Edit user configuration</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855" /> <source>Edit user configuration...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="862" /> <source>Show an editor to edit the user configuration file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="856" /> - <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865" /> + <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874" /> <source>Edit repository configuration</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875" /> <source>Edit repository configuration...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="873" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882" /> <source>Show an editor to edit the repository configuration file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="876" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885" /> <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895" /> <source>Show combined configuration settings</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896" /> <source>Show combined configuration settings...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="894" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903" /> <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909" /> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919" /> <source>Show paths</source> <translation>Zobrazit cesty</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="911" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="920" /> <source>Show paths...</source> <translation>Zobrazit cesty...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="918" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="927" /> <source>Show the aliases for remote repositories</source> <translation>Zobrazit aliasy pro vzádelené repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="921" /> - <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> - <translation><b>Zobrazit cesty</b><p>Zobrazí aliasy vzdálených repozitářů.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930" /> - <source>Verify repository</source> - <translation>Ověřit repozitář</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="931" /> - <source>Verify repository...</source> - <translation>Ověřit repozitář...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937" /> - <source>Verify the integrity of the repository</source> - <translation>Ověřit integritu repozitáře</translation> + <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> + <translation><b>Zobrazit cesty</b><p>Zobrazí aliasy vzdálených repozitářů.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="939" /> - <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> - <translation><b>Ověřit integritu repozitáře</b><p>Ověří integritu repozitáře.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="948" /> - <source>Recover</source> - <translation>Zotavit</translation> + <source>Verify repository</source> + <translation>Ověřit repozitář</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="940" /> + <source>Verify repository...</source> + <translation>Ověřit repozitář...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="946" /> + <source>Verify the integrity of the repository</source> + <translation>Ověřit integritu repozitáře</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="948" /> + <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> + <translation><b>Ověřit integritu repozitáře</b><p>Ověří integritu repozitáře.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="957" /> + <source>Recover</source> + <translation>Zotavit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="957" /> <source>Recover...</source> <translation>Zotavit...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="951" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960" /> <source>Recover from an interrupted transaction</source> <translation>Zotavit z přerušené transakce</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="954" /> - <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> - <translation><b>Zotavit</b><p>Obnoví integritu repozitáře narušenou přerušenou transakcí.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="963" /> - <source>Identify</source> - <translation>Identifikovat</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964" /> - <source>Identify...</source> - <translation>Identifikovat...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="970" /> - <source>Identify the project directory</source> - <translation>Identifikovat adresář projektu</translation> + <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> + <translation><b>Zotavit</b><p>Obnoví integritu repozitáře narušenou přerušenou transakcí.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="972" /> + <source>Identify</source> + <translation>Identifikovat</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973" /> + <source>Identify...</source> + <translation>Identifikovat...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979" /> + <source>Identify the project directory</source> + <translation>Identifikovat adresář projektu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="981" /> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation><b>Identifikovat</b><p>Identifikuje se adresář projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="981" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="990" /> <source>Create .hgignore</source> <translation>Vytvořit .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="989" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="998" /> <source>Create a .hgignore file with default values</source> <translation>Vytvořit soubor .hgignore s výchozími hodnotami</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="992" /> - <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> - <translation><p>Vytvořit .hgignore<br>Vytvoří soubor .hgignore s výchozími hodnotami.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001" /> - <source>Create changegroup</source> - <translation>Vytvořit skupinu změn</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1003" /> - <source>Create changegroup...</source> - <translation>Vytvořit skupinu změn...</translation> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> + <translation><p>Vytvořit .hgignore<br>Vytvoří soubor .hgignore s výchozími hodnotami.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010" /> + <source>Create changegroup</source> + <translation>Vytvořit skupinu změn</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1012" /> + <source>Create changegroup...</source> + <translation>Vytvořit skupinu změn...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1019" /> <source>Create changegroup file collecting changesets</source> <translation>Vytvořit soubor s skupinou změn obsahující množinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1013" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1022" /> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation><b>Vytvořit skupin změn</b><p>Vytvoří soubor se skupinou změn obsahující vybrané množiny změn (hg bundle).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1023" /> - <source>Preview changegroup</source> - <translation>Náhled skupiny změn</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1025" /> - <source>Preview changegroup...</source> - <translation>Náhled skupiny změn...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032" /> + <source>Preview changegroup</source> + <translation>Náhled skupiny změn</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1034" /> + <source>Preview changegroup...</source> + <translation>Náhled skupiny změn...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041" /> <source>Preview a changegroup file containing a collection of changesets</source> <translation>Náhled souboru skupiny změn obsahující množiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044" /> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation><b>Náhled skupiny změn</b><p>Zobrazí náhled souboru skupiny změn obsahující množiny změn.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2244" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1045" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2263" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054" /> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1047" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056" /> <source>Apply changegroups...</source> <translation>Použít skupinu změn...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063" /> <source>Apply one or several changegroup files</source> <translation>Použít soubory s jednou nebo více skupinami změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066" /> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation><b>Použít skupinu změn</b><p>Použije se soubor vygenerovaný příkazem 'Vytvořit skupinu změn', s jednou nebo více skupinami změn (hg unbundle)</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1067" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076" /> <source>Mark as "good"</source> <translation>Označit jako "v pořádku"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1077" /> <source>Mark as "good"...</source> <translation>Označit jako "v pořádku"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1075" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1084" /> <source>Mark a selectable changeset as good</source> <translation>Označit volitelnou množinu změn, že je v pořádku</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1078" /> - <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> - <translation><b>Označit jako "v pořádku"</b><p>Označí se volitelná množina změn, že je v pořádku.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1087" /> - <source>Mark as "bad"</source> - <translation>Označit jako "špatná"</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088" /> - <source>Mark as "bad"...</source> - <translation>Označit jako "špatná"...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1094" /> - <source>Mark a selectable changeset as bad</source> - <translation>Označit volitelnou množinu změn jako špatnou</translation> + <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> + <translation><b>Označit jako "v pořádku"</b><p>Označí se volitelná množina změn, že je v pořádku.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1096" /> - <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> - <translation><b>Označit jako "špatná"</b><p>Označí se volitelná množina změn, že je špatná.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105" /> - <source>Skip</source> - <translation>Přeskočit</translation> + <source>Mark as "bad"</source> + <translation>Označit jako "špatná"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1097" /> + <source>Mark as "bad"...</source> + <translation>Označit jako "špatná"...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103" /> + <source>Mark a selectable changeset as bad</source> + <translation>Označit volitelnou množinu změn jako špatnou</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105" /> + <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> + <translation><b>Označit jako "špatná"</b><p>Označí se volitelná množina změn, že je špatná.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1114" /> + <source>Skip</source> + <translation>Přeskočit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1114" /> <source>Skip...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1107" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116" /> <source>Skip a selectable changeset</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1109" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118" /> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1115" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1115" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124" /> <source>Reset</source> <translation>Reset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1117" /> - <source>Reset the bisect search data</source> - <translation>Reset vyhledávání bisect</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119" /> - <source><b>Reset</b><p>This resets the bisect search data.</p></source> - <translation><b>Reset</b><p>Zresetuje bisect vyhledávání v datech.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1126" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1125" /> + <source>Reset the bisect search data</source> + <translation>Reset vyhledávání bisect</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128" /> + <source><b>Reset</b><p>This resets the bisect search data.</p></source> + <translation><b>Reset</b><p>Zresetuje bisect vyhledávání v datech.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1135" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134" /> <source>Back out changeset</source> <translation>Vycouvat z množiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1142" /> <source>Back out changes of an earlier changeset</source> <translation>Vrátit změny z předchozí množiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1145" /> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation><b>Vycouvat z množiny změn</b><p>Vrátit změny z předchozí množiny změn.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1145" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1155" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154" /> <source>Rollback last transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1152" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161" /> <source>Rollback the last transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1163" /> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1176" /> - <source>Serve project repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1177" /> - <source>Serve project repository...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183" /> - <source>Serve the project repository</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185" /> + <source>Serve project repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1186" /> + <source>Serve project repository...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1192" /> + <source>Serve the project repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1194" /> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2301" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1194" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1203" /> <source>Import Patch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1196" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1205" /> <source>Import Patch...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1202" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211" /> <source>Import a patch from a patch file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1204" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1213" /> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1214" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1223" /> <source>Export Patches</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1225" /> <source>Export Patches...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1222" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1231" /> <source>Export revisions to patch files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1224" /> - <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233" /> - <source>Change Phase</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234" /> - <source>Change Phase...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1240" /> - <source>Change the phase of revisions</source> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1242" /> + <source>Change Phase</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1243" /> + <source>Change Phase...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1249" /> + <source>Change the phase of revisions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251" /> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2343" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1804" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1253" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2362" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1822" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1262" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1260" /> <source>Copy Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1259" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1268" /> <source>Copies changesets from another branch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1261" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270" /> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1273" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1272" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1282" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1281" /> <source>Continue Copying Session</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1280" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1289" /> <source>Continue the last copying session after conflicts were resolved</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1283" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1292" /> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1294" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1293" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1303" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1302" /> <source>Stop Copying Session</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1310" /> <source>Stop the interrupted copying session</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1304" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1313" /> <source><b>Stop Copying Session</b><p>This stops the interrupted copying session.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1314" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1313" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1323" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1322" /> <source>Abort Copying Session</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1321" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330" /> <source>Abort the interrupted copying session and rollback</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1324" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1333" /> <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1334" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1343" /> <source>Add</source> <translation type="unfinished">Přidat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1336" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1345" /> <source>Add...</source> <translation type="unfinished">Přidat...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1342" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1351" /> <source>Add a sub-repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1344" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1353" /> <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1350" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1359" /> <source>Remove</source> <translation type="unfinished">Odebrat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1352" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1361" /> <source>Remove...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1358" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367" /> <source>Remove sub-repositories</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1360" /> - <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1369" /> - <source>Create unversioned archive</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1371" /> - <source>Create unversioned archive...</source> + <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1378" /> + <source>Create unversioned archive</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1380" /> + <source>Create unversioned archive...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1387" /> <source>Create an unversioned archive from the repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1381" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1390" /> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1391" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1400" /> <source>List bookmarks</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1393" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1402" /> <source>List bookmarks...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1399" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1408" /> <source>List bookmarks of the project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1401" /> - <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1410" /> - <source>Define bookmark</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1412" /> - <source>Define bookmark...</source> + <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1419" /> + <source>Define bookmark</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1421" /> + <source>Define bookmark...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1428" /> <source>Define a bookmark for the project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1422" /> - <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1431" /> - <source>Delete bookmark</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1433" /> - <source>Delete bookmark...</source> + <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1440" /> + <source>Delete bookmark</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1442" /> + <source>Delete bookmark...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1449" /> <source>Delete a bookmark of the project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1443" /> - <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1452" /> - <source>Rename bookmark</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1454" /> - <source>Rename bookmark...</source> + <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1461" /> + <source>Rename bookmark</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1463" /> + <source>Rename bookmark...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1470" /> <source>Rename a bookmark of the project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1464" /> - <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1473" /> + <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1482" /> <source>Move bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1475" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1484" /> <source>Move bookmark...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1481" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1490" /> <source>Move a bookmark of the project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1483" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1492" /> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1495" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1493" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1504" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1502" /> <source>Show incoming bookmarks</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1502" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1511" /> <source>Show a list of incoming bookmarks</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1505" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1514" /> <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1517" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1515" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1526" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1524" /> <source>Pull bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1524" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1533" /> <source>Pull a bookmark from a remote repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1527" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1536" /> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1539" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1537" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1548" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1546" /> <source>Pull current bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1546" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1555" /> <source>Pull the current bookmark from a remote repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1549" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1558" /> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1560" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1558" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1569" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1567" /> <source>Show outgoing bookmarks</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1567" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1576" /> <source>Show a list of outgoing bookmarks</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1570" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1579" /> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1582" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1580" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1591" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1589" /> <source>Push bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1589" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1598" /> <source>Push a bookmark to a remote repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1592" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1601" /> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1604" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1602" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1613" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1611" /> <source>Push current bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1611" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1620" /> <source>Push the current bookmark to a remote repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1614" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1623" /> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1626" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1624" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1635" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1633" /> <source>Push all bookmarks</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1633" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1642" /> <source>Push all bookmarks to a remote repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1636" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1645" /> <source><b>Push all bookmarks</b><p>This pushes all bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1647" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1645" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1656" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1654" /> <source>Delete all backups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1654" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1663" /> <source>Delete all backup bundles stored in the backup area</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1657" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1666" /> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1699" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1708" /> <source>Administration</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1724" /> - <source>Specials</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1733" /> + <source>Specials</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1742" /> <source>Changegroup Management</source> <translation>Správa skupin změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1740" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1749" /> <source>Patch Management</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1746" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1755" /> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1754" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1763" /> <source>Tags</source> <translation type="unfinished">Tagy</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1761" /> - <source>Branches</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1770" /> + <source>Branches</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1779" /> <source>Bookmarks</source> <translation type="unfinished">Záložky</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1791" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1800" /> + <source>Other Functions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1809" /> <source>Extensions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1813" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1831" /> <source>Sub-Repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1818" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1836" /> <source>Merge Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1903" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1901" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1922" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1920" /> <source>Mercurial</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2054" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2073" /> <source>Pull</source> <translation type="unfinished">Stáhnout</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2391" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2375" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2360" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2344" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2323" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2302" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2245" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2055" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2410" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2394" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2379" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2363" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2342" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2321" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2264" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2074" /> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Projekt bude znovu načten. Má se provést?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2322" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2341" /> <source>Revert Changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2359" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2378" /> <source>Copy Changesets (Continue)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2374" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2393" /> <source>Copy Changesets (Stop)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2390" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2409" /> <source>Copy Changesets (Abort)</source> <translation type="unfinished" /> </message> @@ -40660,7 +40864,7 @@ <context> <name>HgPurgeListDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/HgPurgeListDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/HgPurgeListDialog.ui" line="0" /> <source>Purge List</source> <translation type="unfinished" /> </message> @@ -41830,87 +42034,87 @@ <context> <name>HgShelveBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Mercurial Shelve Browser</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Name</source> <translation type="unfinished">Jméno</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Age</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Message</source> <translation type="unfinished">Zpráva</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Statistics</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>File</source> <translation type="unfinished">Soubor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Lines added</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Lines deleted</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Errors</source> <translation type="unfinished">Chyby</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source><b>Mercurial shelve errors</b><p>This shows possible error messages of the hg shelve command.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="58" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="58" /> <source>&Refresh</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="60" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="60" /> <source>Press to refresh the list of shelves</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="69" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="69" /> <source>Restore selected shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="72" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="72" /> <source>Delete selected shelves</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="75" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="75" /> <source>Delete all shelves</source> <translation type="unfinished" /> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="290" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="290" /> <source>%n file(s) changed</source> <translation> <numerusform /> @@ -41919,7 +42123,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="292" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="292" /> <source>%n line(s) inserted</source> <translation> <numerusform /> @@ -41928,7 +42132,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="295" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="295" /> <source>%n line(s) deleted</source> <translation> <numerusform /> @@ -41940,57 +42144,57 @@ <context> <name>HgShelveDataDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Name:</source> <translation type="unfinished">Jméno:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Enter a name for the shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Date, Time:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Enter the commit date and time for the shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>yyyy-MM-dd HH:mm</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Message:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Enter a message for the shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Mark new/missing files as added/removed</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Select to shelve, but keep the changes in the working directory</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Shelve, but keep changes</source> <translation type="unfinished" /> </message> @@ -41998,7 +42202,7 @@ <context> <name>HgShelvesSelectionDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelvesSelectionDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelvesSelectionDialog.ui" line="0" /> <source>Mercurial Shelve Selection</source> <translation type="unfinished" /> </message> @@ -42301,124 +42505,56 @@ <context> <name>HgStripDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Strip Changesets</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>&Revision</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> <source>Select to specify a revision by number</source> - <translation type="unfinished">Vybrat pro zadání revize číslem</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Vybrat pro zadání revize číslem</translation> + </message> + <message> <source>Number</source> - <translation type="unfinished">Číslo</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Číslo</translation> + </message> + <message> <source>Enter a revision number</source> - <translation type="unfinished">Zadejte číslo revize</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Zadejte číslo revize</translation> + </message> + <message> <source>Select to specify a revision by changeset id</source> - <translation type="unfinished">Vybrat pro zadání revize přes id množiny změn</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Vybrat pro zadání revize přes id množiny změn</translation> + </message> + <message> <source>Id:</source> - <translation type="unfinished">Id:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Id:</translation> + </message> + <message> <source>Enter a changeset id</source> - <translation type="unfinished">Zadejte id množiny změn</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Zadejte id množiny změn</translation> + </message> + <message> <source>Select to specify a revision by a tag</source> - <translation type="unfinished">Vybrat pro specifikaci revize tagem</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Vybrat pro specifikaci revize tagem</translation> + </message> + <message> <source>Tag:</source> - <translation type="unfinished">Tag:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Tag:</translation> + </message> + <message> <source>Enter a tag name</source> - <translation type="unfinished">Zadejte jméno tagu</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Zadejte jméno tagu</translation> + </message> + <message> <source>Select to specify a revision by a branch</source> - <translation type="unfinished">Vybrat pro specifikaci revize přes větev</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Vybrat pro specifikaci revize přes větev</translation> + </message> + <message> <source>Branch:</source> - <translation type="unfinished">Větev:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Větev:</translation> + </message> + <message> <source>Enter a branch name</source> - <translation type="unfinished">Zadejte jméno větve</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Zadejte jméno větve</translation> + </message> + <message> <source>Expression:</source> - <translation type="unfinished">Sledovací bod:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enter a revision set expression</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Bookmark:</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enter a bookmark name</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to enforce removal of changesets</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enforce Operation</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to not create backup bundles</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>No Backup</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to keep the current working directory state</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Keep Working Directory</source> - <translation type="unfinished" /> + <translation type="vanished">Sledovací bod:</translation> </message> </context> <context> @@ -42930,29 +43066,123 @@ </message> </context> <context> + <name>HgUncommitDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Undo Local Commit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Commit Message</source> + <translation type="unfinished">Commit zpráva</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Enter the log message.</source> + <translation type="unfinished">Zadání log zprávy.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source><b>Log Message</b> +<p>Enter the log message for the uncommit action.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Recent commit messages</source> + <translation type="unfinished">Poslední commit zprávy</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Select a recent commit message to use</source> + <translation type="unfinished">Výběr poslední commit zprávy</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Select to allow an empty commit after undoing it.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Allow empty commit after undoing commit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Select to allow undoing the commit with outstanding changes.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Allow undoing commit with outstanding changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Author</source> + <translation type="unfinished">Autor</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Enter author name to override the configured user:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Enter an author name in order to override the configured one</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Select to give date and time information</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Date and Time</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Date/Time:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Enter the date and time to be used</source> + <translation type="unfinished" /> + </message> + <message> + <source><b>Log Message</b> +<p>Enter the log message for the commit action.</p></source> + <translation type="vanished"><b>Log message</b><p>Zadejte log message pro provedení příkazu commit.</p></translation> + </message> + </context> + <context> <name>HgUnshelveDataDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Mercurial Unshelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Name:</source> <translation type="unfinished">Jméno:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Enter the name of the shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Select to keep the shelved change</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Keep shelved change</source> <translation type="unfinished" /> </message> @@ -43022,22 +43252,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> @@ -43053,52 +43283,42 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the Purge 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>Purge</source> + <source>Histedit</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the queues extension</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Queues</source> + <source>Select to activate the GPG 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>GPG</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Rebase</source> + <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 shelve extension</source> + <source>Fastexport</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Shelve</source> + <source>Select to activate the uncommit extension</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the strip extension</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Strip</source> + <source>Uncommit</source> <translation type="unfinished" /> </message> <message> @@ -43318,32 +43538,32 @@ <translation type="unfinished">Výchozí</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="527" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="474" /> <source>Delete Host Fingerprint</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="528" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="475" /> <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="644" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="591" /> <source>Delete Host Minimum Protocol</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="645" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="592" /> <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="708" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="655" /> <source>Edit User Configuration</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="709" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="656" /> <source>You will loose all changes made in this dialog. Shall the data be saved first?</source> <translation type="unfinished" /> </message> @@ -43422,17 +43642,17 @@ <context> <name>HgUtilities</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="130" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="132" /> <source>The hg process finished with the exit code {0}</source> <translation type="unfinished">hg proces skončil s exit kódem {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="134" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="136" /> <source>The hg process did not finish within 30s.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="138" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="140" /> <source>Could not start the hg executable.</source> <translation type="unfinished">Nelze spustit hg program.</translation> </message> @@ -50744,13 +50964,13 @@ <name>Lexers</name> <message> <location filename="../QScintilla/Lexers/__init__.py" line="412" /> - <location filename="../Preferences/__init__.py" line="599" /> + <location filename="../Preferences/__init__.py" line="598" /> <source>Python Files (*.py *.py3)</source> <translation type="unfinished">Python soubory (*.py *.py3)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="505" /> - <location filename="../Preferences/__init__.py" line="602" /> + <location filename="../Preferences/__init__.py" line="601" /> <source>Python3 Files (*.py)</source> <translation>Python3 soubory (*.py)</translation> </message> @@ -52589,8 +52809,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> @@ -53950,7 +54170,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> @@ -60183,74 +60403,12 @@ </message> <message> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to install the selected package</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to install the selected package to the user site</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to show details for the selected entry</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Toggle to show or hide the search window</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Package</source> + <source>Press to refresh the lists</source> <translation type="unfinished" /> </message> <message> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Enter the search term for the package name</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Enter search term</source> - <translation type="unfinished">Zadejte hledaný výraz</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to start the search</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to search for more packages</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Version</source> - <translation type="unfinished">Verze</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Released</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Description</source> - <translation type="unfinished">Popisek</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to refresh the lists</source> + <source>Press to install a package.</source> <translation type="unfinished" /> </message> <message> @@ -60270,6 +60428,17 @@ </message> <message> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Press to show details for the selected entry</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Press to remove leftovers of an upgrade or uninstall run.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> <source>Select to show only locally-installed packages</source> <translation type="unfinished" /> </message> @@ -60313,6 +60482,13 @@ <message> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Package</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> <source>Installed</source> <translation type="unfinished" /> </message> @@ -60407,320 +60583,338 @@ <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="199" /> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Search Package:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Enter package name to search for.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Press to open a web browser for searching.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="83" /> <source>pip Menu</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="233" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="113" /> <source>Author:</source> <translation type="unfinished">Autor:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="234" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="114" /> <source>Author Email:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="235" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="115" /> <source>Classifiers:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="236" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="116" /> <source>Entry Points:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="237" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="117" /> <source>Files:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="238" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="118" /> <source>Homepage:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="239" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="119" /> <source>Installer:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="240" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="120" /> <source>License:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="241" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="121" /> <source>Location:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="242" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="122" /> <source>Metadata Version:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="243" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="123" /> <source>Name:</source> <translation type="unfinished">Jméno:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="244" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="124" /> <source>Project URLs:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="245" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="125" /> <source>Requires:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="246" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="126" /> <source>Required By:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="247" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="127" /> <source>Summary:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="248" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="128" /> <source>Version:</source> <translation type="unfinished">Verze:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="450" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="335" /> <source>Getting installed packages...</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="478" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="363" /> <source>Getting outdated packages...</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1231" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1051" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1038" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1002" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="735" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="729" /> + <source>Cleanup Environment</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="730" /> + <source>The environment cleanup was successful.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="736" /> + <source>Some leftover package directories could not been removed. Delete them manually.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="834" /> <source>Search PyPI</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1003" /> - <source><p>Received an error while searching for <b>{0}</b>.</p><p>Error: {1}</p></source> - <translation type="unfinished" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="835" /> + <source><p>No package details info for <b>{0}</b> available.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="854" /> + <source>Pip</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="856" /> + <source>Install Pip</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="859" /> + <source>Install Pip to User-Site</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="862" /> + <source>Repair Pip</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="869" /> + <source>Install</source> + <translation type="unfinished">Instalovat</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1048" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="871" /> + <source>Install Packages</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="874" /> + <source>Install Local Package</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="877" /> + <source>Re-Install Selected Packages</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="884" /> + <source>Requirements/Constraints</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="886" /> + <source>Install Requirements</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="889" /> + <source>Uninstall Requirements</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="892" /> + <source>Generate Requirements...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="896" /> + <source>Install from 'pyproject.toml'</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="900" /> + <source>Uninstall from 'pyproject.toml'</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="905" /> + <source>Generate Constraints...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="912" /> + <source>Cache</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="914" /> + <source>Show Cache Info...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="917" /> + <source>Show Cached Files...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="920" /> + <source>Remove Cached Files...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="923" /> + <source>Purge Cache...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="940" /> + <source>Show Licenses...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="944" /> + <source>Check Vulnerabilities</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="948" /> + <source>Update Vulnerability Database</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="952" /> + <source>Create SBOM file</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="959" /> + <source>Edit User Configuration...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="962" /> + <source>Edit Environment Configuration...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="967" /> + <source>Configure...</source> + <translation type="unfinished">Konfigurovat...</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1211" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1198" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1187" /> + <source>Edit Configuration</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1212" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1199" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1188" /> + <source>No valid configuration path determined. Aborting</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1421" /> + <source>{0} {1}</source> + <comment>package name, package version</comment> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1442" /> + <source>Affected Version:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1445" /> + <source>Advisory:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1580" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1555" /> + <source>unknown</source> + <translation type="unfinished">neznámý</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1577" /> + <source>any</source> + <translation type="unfinished" /> + </message> + <message> + <source>Enter search term</source> + <translation type="vanished">Zadejte hledaný výraz</translation> + </message> + <message> + <source>Version</source> + <translation type="vanished">Verze</translation> + </message> + <message> + <source>Description</source> + <translation type="vanished">Popisek</translation> </message> <message numerus="yes"> - <location filename="../PipInterface/PipPackagesWidget.py" line="1018" /> <source>%n package(s) found.</source> - <translation type="unfinished"> + <translation type="vanished"> <numerusform /> <numerusform /> <numerusform /> </translation> </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1025" /> - <source>Showing first {0} packages found.</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1044" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1039" /> - <source><p>There were no results for <b>{0}</b>.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1052" /> - <source><p>There were no more results for <b>{0}</b>.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1232" /> - <source><p>No package details info for <b>{0}</b> available.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1251" /> - <source>Pip</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1253" /> - <source>Install Pip</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1256" /> - <source>Install Pip to User-Site</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1259" /> - <source>Repair Pip</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1266" /> - <source>Install</source> - <translation type="unfinished">Instalovat</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1445" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1268" /> - <source>Install Packages</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1271" /> - <source>Install Local Package</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1274" /> - <source>Re-Install Selected Packages</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1281" /> - <source>Requirements/Constraints</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1283" /> - <source>Install Requirements</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1286" /> - <source>Uninstall Requirements</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1289" /> - <source>Generate Requirements...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1293" /> - <source>Install from 'pyproject.toml'</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1297" /> - <source>Uninstall from 'pyproject.toml'</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1302" /> - <source>Generate Constraints...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1309" /> - <source>Cache</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1311" /> - <source>Show Cache Info...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1314" /> - <source>Show Cached Files...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1317" /> - <source>Remove Cached Files...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1320" /> - <source>Purge Cache...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1337" /> - <source>Show Licenses...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1341" /> - <source>Check Vulnerabilities</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1345" /> - <source>Update Vulnerability Database</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1349" /> - <source>Create SBOM file</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1356" /> - <source>Edit User Configuration...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1359" /> - <source>Edit Environment Configuration...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1364" /> - <source>Configure...</source> - <translation type="unfinished">Konfigurovat...</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1608" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1595" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1584" /> - <source>Edit Configuration</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1609" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1596" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1585" /> - <source>No valid configuration path determined. Aborting</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1818" /> - <source>{0} {1}</source> - <comment>package name, package version</comment> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1839" /> - <source>Affected Version:</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1842" /> - <source>Advisory:</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1977" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1952" /> - <source>unknown</source> - <translation type="unfinished">neznámý</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1974" /> - <source>any</source> - <translation type="unfinished" /> - </message> </context> <context> <name>PipPackagesWindow</name> @@ -61553,64 +61747,69 @@ <name>PluginRepositoryWidget</name> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="124" /> - <source>Stable</source> - <translation>Stabilní</translation> + <source>Obsolete</source> + <translation type="unfinished" /> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="125" /> - <source>Unstable</source> - <translation>Nestabilní</translation> + <source>Stable</source> + <translation>Stabilní</translation> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="126" /> - <source>Obsolete</source> - <translation type="unfinished" /> + <source>Unknown</source> + <translation>Neznámý</translation> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="127" /> - <source>Unknown</source> - <translation>Neznámý</translation> - </message> - <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="179" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="139" /> - <source>Update</source> - <translation>Obnovit</translation> + <source>Unstable</source> + <translation>Nestabilní</translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="128" /> + <source>Upgrade Available</source> + <translation type="unfinished" /> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="182" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="145" /> - <source>Download</source> - <translation>Download</translation> - </message> - <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="153" /> - <source>Download & Install</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="188" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="161" /> - <source>Cancel</source> - <translation>Zrušit</translation> - </message> - <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="167" /> - <source>Install</source> - <translation type="unfinished">Instalovat</translation> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="142" /> + <source>Update</source> + <translation>Obnovit</translation> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="185" /> - <source>Download && Install</source> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="148" /> + <source>Download</source> + <translation>Download</translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="156" /> + <source>Download & Install</source> <translation type="unfinished" /> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="191" /> - <source>Close && Install</source> - <translation>Zavřít && Instalovat</translation> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="164" /> + <source>Cancel</source> + <translation>Zrušit</translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="170" /> + <source>Install</source> + <translation type="unfinished">Instalovat</translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="188" /> + <source>Download && Install</source> + <translation type="unfinished" /> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="194" /> + <source>Close && Install</source> + <translation>Zavřít && Instalovat</translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="197" /> <source>Close</source> <translation type="unfinished">Zavřít</translation> </message> @@ -61662,98 +61861,103 @@ <translation>Požadované pluginy byly staženy.</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="603" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="591" /> <source>Plugins Repository URL Changed</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="604" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="592" /> <source>The URL of the Plugins Repository has changed. Select the "Update" button to get the new repository file.</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="613" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="601" /> <source>Read plugins repository file</source> <translation>Číst soubor repozitáře pluginů</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="614" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="602" /> <source><p>The plugins repository file <b>{0}</b> could not be read. Select Update</p></source> <translation><p>Soubor repozitáře pluginů <b>{0}</b> nelze přečíst. Vyberte Obnovit</p></translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="623" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="611" /> <source>No plugin repository file available. Select Update.</source> <translation>Soubor repozitáře pluginů není k dispozici. Vyberte Obnovit.</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="627" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="615" /> <source>New: <b>{0}</b></source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="629" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="617" /> <source>Local Updates: <b>{0}</b></source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="632" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="620" /> <source>Remote Updates: <b>{0}</b></source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="705" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="673" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="693" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="661" /> <source>Error downloading file</source> <translation>Chyba při stahování souboru</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="706" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="674" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="694" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="662" /> <source><p>Could not download the requested file from {0}.</p><p>Error: {1}</p></source> <translation><p>Nelze stáhnout požadovaný soubor z {0}.</p><p>Chyba: {1}</p></translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="677" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="665" /> <source>No connection to Internet.</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="849" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="810" /> <source>up-to-date</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="852" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="813" /> <source>new download available</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="856" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="818" /> <source>update installable</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="860" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="823" /> <source>updated download available</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="864" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="828" /> <source>error determining status</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1269" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1239" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1002" /> + <source>{0}. {1}</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1346" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1316" /> <source>Cleanup of Plugin Downloads</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1273" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1242" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1350" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1319" /> <source><p>The plugin download <b>{0}</b> could not be deleted.</p><p>Reason: {1}</p></source> <translation type="unfinished" /> </message> @@ -61761,17 +61965,17 @@ <context> <name>PluginRepositoryWindow</name> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1126" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1203" /> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1127" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1204" /> <source><p>Could not start the process.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Nemohu spustit zveřejnění.<br>Ověřte jestli je dostupný jako <b>{0}</b>.</p></translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1131" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1208" /> <source>OK</source> <translation>OK</translation> </message> @@ -62148,18 +62352,18 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1908" /> + <location filename="../Preferences/__init__.py" line="1909" /> <source>Export Preferences</source> <translation>Předvolby exportu</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1937" /> - <location filename="../Preferences/__init__.py" line="1910" /> + <location filename="../Preferences/__init__.py" line="1938" /> + <location filename="../Preferences/__init__.py" line="1911" /> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/__init__.py" line="1935" /> + <location filename="../Preferences/__init__.py" line="1936" /> <source>Import Preferences</source> <translation>Předvolby importu</translation> </message> @@ -62721,79 +62925,79 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="273" /> + <location filename="../Preferences/ProgramsDialog.py" line="275" /> <source>PyPI Package Management</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="525" /> - <location filename="../Preferences/ProgramsDialog.py" line="522" /> - <location filename="../Preferences/ProgramsDialog.py" line="506" /> - <location filename="../Preferences/ProgramsDialog.py" line="376" /> - <location filename="../Preferences/ProgramsDialog.py" line="309" /> - <location filename="../Preferences/ProgramsDialog.py" line="292" /> + <location filename="../Preferences/ProgramsDialog.py" line="527" /> + <location filename="../Preferences/ProgramsDialog.py" line="524" /> + <location filename="../Preferences/ProgramsDialog.py" line="508" /> + <location filename="../Preferences/ProgramsDialog.py" line="378" /> + <location filename="../Preferences/ProgramsDialog.py" line="311" /> + <location filename="../Preferences/ProgramsDialog.py" line="294" /> <source>(unknown)</source> <translation>(neznámý)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="296" /> + <location filename="../Preferences/ProgramsDialog.py" line="298" /> <source>Spell Checker - PyEnchant</source> <translation /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="313" /> + <location filename="../Preferences/ProgramsDialog.py" line="315" /> <source>Source Highlighter - Pygments</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="320" /> + <location filename="../Preferences/ProgramsDialog.py" line="322" /> <source>MicroPython - MPY Cross Compiler</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="327" /> + <location filename="../Preferences/ProgramsDialog.py" line="329" /> <source>MicroPython - ESP Tool</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="338" /> + <location filename="../Preferences/ProgramsDialog.py" line="340" /> <source>MicroPython - PyBoard Flasher</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="348" /> + <location filename="../Preferences/ProgramsDialog.py" line="350" /> <source>MicroPython - STLink Info</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="358" /> + <location filename="../Preferences/ProgramsDialog.py" line="360" /> <source>MicroPython - STLink Flasher</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="380" /> + <location filename="../Preferences/ProgramsDialog.py" line="382" /> <source>Code Assistant - Jedi</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="460" /> + <location filename="../Preferences/ProgramsDialog.py" line="462" /> <source>(not configured)</source> <translation>(nezkonfigurováno)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="495" /> + <location filename="../Preferences/ProgramsDialog.py" line="497" /> <source>(module not found)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="528" /> + <location filename="../Preferences/ProgramsDialog.py" line="530" /> <source>(not executable)</source> <translation>(nevykonavatelný)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="574" /> + <location filename="../Preferences/ProgramsDialog.py" line="576" /> + <location filename="../Preferences/ProgramsDialog.py" line="544" /> <location filename="../Preferences/ProgramsDialog.py" line="542" /> - <location filename="../Preferences/ProgramsDialog.py" line="540" /> <source>(not found)</source> <translation>(nenalezeno)</translation> </message> @@ -66998,7 +67202,7 @@ <translation /> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="306" /> + <location filename="../Project/PropertiesDialog.py" line="312" /> <location filename="../Project/PropertiesDialog.py" line="71" /> <source>None</source> <translation type="unfinished" /> @@ -67024,12 +67228,12 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="261" /> + <location filename="../Project/PropertiesDialog.py" line="267" /> <source>Source Files ({0});;All Files (*)</source> <translation>Zdrojové soubory ({0});;Všechny soubory (*)</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="265" /> + <location filename="../Project/PropertiesDialog.py" line="271" /> <source>All Files (*)</source> <translation type="unfinished">Všechny soubory (*)</translation> </message> @@ -67070,22 +67274,22 @@ <context> <name>Purge</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="76" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/purge.py" line="83" /> <source>Purge All Files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="77" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/purge.py" line="84" /> <source>Do really want to delete all files not tracked by Mercurial (including ignored ones)?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="82" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/purge.py" line="89" /> <source>Purge Files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="83" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/purge.py" line="90" /> <source>Do really want to delete files not tracked by Mercurial?</source> <translation type="unfinished" /> </message> @@ -67093,79 +67297,115 @@ <context> <name>PurgeProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="36" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="34" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="36" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="34" /> <source>Purge Files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="43" /> - <source>Delete files and directories not known to Mercurial</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="46" /> - <source><b>Purge Files</b><p>This deletes files and directories not known to Mercurial. That means that purge will delete:<ul><li>unknown files (marked with "not tracked" in the status dialog)</li><li>empty directories</li></ul>Note that ignored files will be left untouched.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="61" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="60" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="43" /> + <source>Delete not version controlled files and directories</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="46" /> + <source><b>Purge Files</b><p>This deletes not version controlled files and directories. That means that purge will delete:<ul><li>not version controlled files (marked with "not tracked" in the status dialog)</li><li>empty directories</li></ul>Note that ignored files will be left untouched.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="61" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="60" /> <source>Purge All Files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="68" /> - <source>Delete files and directories not known to Mercurial including ignored ones</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="74" /> - <source><b>Purge All Files</b><p>This deletes files and directories not known to Mercurial. That means that purge will delete:<ul><li>unknown files (marked with "not tracked" in the status dialog)</li><li>empty directories</li><li>ignored files and directories</li></ul></p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="89" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="68" /> + <source>Delete not version controlled files and directories including ignored ones</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="74" /> + <source><b>Purge All Files</b><p>This deletes not version controlled files and directories. That means that purge will delete:<ul><li>not version controlled files (marked with "not tracked" in the status dialog)</li><li>empty directories</li><li>ignored files and directories</li></ul></p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="90" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="89" /> + <source>Purge Ignored Files</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="97" /> + <source>Delete ignored files and directories</source> + <translation type="unfinished" /> + </message> + <message> + <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/PurgeExtension/ProjectHelper.py" line="91" /> + <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/PurgeExtension/ProjectHelper.py" line="98" /> - <source>List files and directories not known to Mercurial</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="101" /> - <source><b>List Files to be Purged</b><p>This lists files and directories not known to Mercurial. These would be deleted by the "Purge Files" menu entry.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="111" /> + <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="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="131" /> <source>List All Files to be Purged</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="112" /> + <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/PurgeExtension/ProjectHelper.py" line="119" /> - <source>List files and directories not known to Mercurial including ignored ones</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="125" /> - <source><b>List All Files to be Purged</b><p>This lists files and directories not known to Mercurial 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/PurgeExtension/ProjectHelper.py" line="163" /> + <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="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="156" /> + <source>List Ignored Files to be Purged</source> + <translation type="unfinished" /> + </message> + <message> + <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="164" /> + <source>List ignored files and directories</source> + <translation type="unfinished" /> + </message> + <message> + <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="206" /> <source>Purge</source> <translation type="unfinished" /> </message> @@ -76091,49 +76331,49 @@ <context> <name>Shelve</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="105" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="105" /> <source>Shelve current changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="151" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="151" /> <source>Restore shelved changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="170" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="170" /> <source>Abort restore operation</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="191" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="191" /> <source>Continue restore operation</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="211" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="211" /> <source>Select the shelves to be deleted:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="231" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="222" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="231" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="222" /> <source>Delete shelves</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="223" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="223" /> <source>Do you really want to delete these shelves?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="249" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="242" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="249" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="242" /> <source>Delete all shelves</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="243" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="243" /> <source>Do you really want to delete all shelved changes?</source> <translation type="unfinished" /> </message> @@ -76141,21 +76381,21 @@ <context> <name>ShelveProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="62" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="57" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="52" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="47" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="62" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="57" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="52" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="47" /> <source>Shelve changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="122" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="74" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="122" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="74" /> <source>Shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="104" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="104" /> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Projekt bude znovu načten. Má se provést?</translation> </message> @@ -76163,154 +76403,154 @@ <context> <name>ShelveProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="34" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="34" /> <source>Shelve changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="35" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="35" /> <source>Shelve changes...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="42" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="42" /> <source>Shelve all current changes of the project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="45" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="45" /> <source><b>Shelve changes</b><p>This shelves all current changes of the project.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="54" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="54" /> <source>Show shelve browser</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="55" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="55" /> <source>Show shelve browser...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="61" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="61" /> <source>Show a dialog with all shelves</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="63" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="63" /> <source><b>Show shelve browser...</b><p>This shows a dialog listing all available shelves. Actions on these shelves may be executed via the context menu.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="74" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="74" /> <source>Restore shelved change</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="75" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="75" /> <source>Restore shelved change...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="82" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="82" /> <source>Restore a shelved change to the project directory</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="85" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="85" /> <source><b>Restore shelved change</b><p>This restore a shelved change to the project directory.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="95" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="95" /> <source>Abort restore</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="96" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="96" /> <source>Abort restore...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="103" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="103" /> <source>Abort the restore operation in progress</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="106" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="106" /> <source><b>Abort restore</b><p>This aborts the restore operation in progress and reverts already applied changes.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="116" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="116" /> <source>Continue restore</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="117" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="117" /> <source>Continue restore...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="124" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="124" /> <source>Continue the restore operation in progress</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="127" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="127" /> <source><b>Continue restore</b><p>This continues the restore operation in progress.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="136" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="136" /> <source>Delete shelved changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="137" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="137" /> <source>Delete shelved changes...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="144" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="144" /> <source><b>Delete shelved changes...</b><p>This opens a dialog to select the shelved changes to delete and deletes the selected ones.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="155" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="154" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="155" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="154" /> <source>Delete ALL shelved changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="162" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="162" /> <source><b>Delete ALL shelved changes</b><p>This deletes all shelved changes.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="231" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="202" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="231" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="202" /> <source>Shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="218" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="218" /> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Projekt bude znovu načten. Má se provést?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="244" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="244" /> <source>Unshelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="251" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="251" /> <source>Abort Unshelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="258" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="258" /> <source>Continue Unshelve</source> <translation type="unfinished" /> </message> @@ -78942,41 +79182,10 @@ </message> </context> <context> - <name>Strip</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/strip.py" line="68" /> - <source>Stripping changesets from repository</source> - <translation type="unfinished" /> - </message> - </context> - <context> <name>StripProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="37" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="35" /> - <source>Strip changesets</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="43" /> - <source>Strip changesets from a repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="45" /> - <source><b>Strip changesets</b><p>This deletes a changeset and all its descendants from a repository. Each removed changeset will be stored in .hg/strip-backup as a bundle file.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="91" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="79" /> - <source>Strip</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="92" /> <source>The project should be reread. Do this now?</source> - <translation type="unfinished">Projekt bude znovu načten. Má se provést?</translation> + <translation type="vanished">Projekt bude znovu načten. Má se provést?</translation> </message> </context> <context> @@ -80082,12 +80291,12 @@ <context> <name>SvnDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="165" /> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="168" /> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="166" /> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="169" /> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> @@ -90543,6 +90752,66 @@ </message> </context> <context> + <name>Uncommit</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/uncommit.py" line="64" /> + <source>Undo Local Commit</source> + <translation type="unfinished" /> + </message> + </context> + <context> + <name>UncommitProjectBrowserHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="145" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="82" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="72" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="62" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="52" /> + <source>Undo Local Commit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="96" /> + <source>Uncommit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="126" /> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished">Projekt bude znovu načten. Má se provést?</translation> + </message> + </context> + <context> + <name>UncommitProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="107" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="38" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="36" /> + <source>Undo Local Commit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="44" /> + <source>Undo the effect of a local commit.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="46" /> + <source><b>Undo Local Commit</b><p>This undoes the effect of a local commit, returning the affected files to their uncommitted state.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="79" /> + <source>Uncommit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="95" /> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished">Projekt bude znovu načten. Má se provést?</translation> + </message> + </context> + <context> <name>UnittestExecutor</name> <message> <location filename="../Testing/Interfaces/UnittestExecutor.py" line="52" /> @@ -91189,7 +91458,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7892" /> + <location filename="../UI/UserInterface.py" line="7893" /> <location filename="../UI/UserInterface.py" line="1955" /> <location filename="../UI/UserInterface.py" line="1948" /> <source>Load session</source> @@ -92517,8 +92786,8 @@ <translation><b>Klávesové zkratky</b><p>Nastavení klávesových zkratek aplikace podle zvyklostí uživatele.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7600" /> - <location filename="../UI/UserInterface.py" line="7581" /> + <location filename="../UI/UserInterface.py" line="7601" /> + <location filename="../UI/UserInterface.py" line="7582" /> <location filename="../UI/UserInterface.py" line="3402" /> <source>Export Keyboard Shortcuts</source> <translation>Exportovat klávesové zkratky</translation> @@ -92539,7 +92808,7 @@ <translation><b>Export klávesových zkratek</b><p>Exportují se klávesové zkratky z aplikace.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7619" /> + <location filename="../UI/UserInterface.py" line="7620" /> <location filename="../UI/UserInterface.py" line="3421" /> <source>Import Keyboard Shortcuts</source> <translation>Import klávesových zkratek</translation> @@ -93266,169 +93535,169 @@ </translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7108" /> - <location filename="../UI/UserInterface.py" line="7046" /> - <location filename="../UI/UserInterface.py" line="7002" /> - <location filename="../UI/UserInterface.py" line="6928" /> - <location filename="../UI/UserInterface.py" line="6864" /> - <source>Documentation Missing</source> - <translation>Dokumentace chybí</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="7109" /> <location filename="../UI/UserInterface.py" line="7047" /> <location filename="../UI/UserInterface.py" line="7003" /> <location filename="../UI/UserInterface.py" line="6929" /> <location filename="../UI/UserInterface.py" line="6865" /> + <source>Documentation Missing</source> + <translation>Dokumentace chybí</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7110" /> + <location filename="../UI/UserInterface.py" line="7048" /> + <location filename="../UI/UserInterface.py" line="7004" /> + <location filename="../UI/UserInterface.py" line="6930" /> + <location filename="../UI/UserInterface.py" line="6866" /> <source><p>The documentation starting point "<b>{0}</b>" could not be found.</p></source> <translation><p>Adresář dokumentace "<b>{0}</b>" nebyl nalezen.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7090" /> - <location filename="../UI/UserInterface.py" line="6972" /> - <source>Documentation</source> - <translation>Dokumentace</translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="6973" /> - <source><p>The PyQt{0} documentation starting point has not been configured.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="7091" /> + <location filename="../UI/UserInterface.py" line="6973" /> + <source>Documentation</source> + <translation>Dokumentace</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="6974" /> + <source><p>The PyQt{0} documentation starting point has not been configured.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7092" /> <source><p>The PySide{0} documentation starting point has not been configured.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7270" /> - <location filename="../UI/UserInterface.py" line="7206" /> - <source>Start Web Browser</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../UI/UserInterface.py" line="7207" /> - <source>The eric web browser could not be started.</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="7271" /> + <location filename="../UI/UserInterface.py" line="7207" /> + <source>Start Web Browser</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7208" /> + <source>The eric web browser could not be started.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7272" /> <source><p>The eric web browser is not started.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7317" /> + <location filename="../UI/UserInterface.py" line="7318" /> <source>Open Browser</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7317" /> + <location filename="../UI/UserInterface.py" line="7318" /> <source>Could not start a web browser</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7621" /> - <location filename="../UI/UserInterface.py" line="7583" /> + <location filename="../UI/UserInterface.py" line="7622" /> + <location filename="../UI/UserInterface.py" line="7584" /> <source>Keyboard Shortcuts File (*.ekj)</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7601" /> + <location filename="../UI/UserInterface.py" line="7602" /> <source><p>The keyboard shortcuts file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7805" /> + <location filename="../UI/UserInterface.py" line="7806" /> <source>Load crash session...</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7808" /> + <location filename="../UI/UserInterface.py" line="7809" /> <source>Clean crash sessions...</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7845" /> - <source>Read Session</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="7846" /> + <source>Read Session</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7847" /> <source><p>The session file <b>{0}</b> could not be read.</p></source> <translation><p>Soubor relace session <b>{0}</b> nelze přečíst.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7869" /> + <location filename="../UI/UserInterface.py" line="7870" /> <source>Save Session</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7894" /> - <location filename="../UI/UserInterface.py" line="7871" /> + <location filename="../UI/UserInterface.py" line="7895" /> + <location filename="../UI/UserInterface.py" line="7872" /> <source>eric Session Files (*.esj)</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7963" /> - <source>Found Crash Sessions</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="7964" /> + <source>Found Crash Sessions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7965" /> <source>These crash session files were found. Select the one to open. Select 'Cancel' to not open a crash session.</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="8037" /> - <source>Clean stale crash sessions</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="8038" /> + <source>Clean stale crash sessions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8039" /> <source>Do you really want to delete these stale crash session files?</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="8414" /> - <source>Drop Error</source> - <translation>Zahodit chybu</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="8415" /> + <source>Drop Error</source> + <translation>Zahodit chybu</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8416" /> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> není soubor.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="8612" /> - <source>Upgrade available</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="8613" /> + <source>Upgrade available</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8614" /> <source><p>A newer version of the <b>eric-ide</b> package is available at <a href="{0}/eric-ide/">PyPI</a>.</p><p>Installed: {1}<br/>Available: <b>{2}</b></p><p>Shall <b>eric-ide</b> be upgraded?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="8661" /> - <source>First time usage</source> - <translation>Spuštěno poprvé</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="8662" /> + <source>First time usage</source> + <translation>Spuštěno poprvé</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8663" /> <source>eric has not been configured yet. The configuration dialog will be started.</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="8684" /> + <location filename="../UI/UserInterface.py" line="8685" /> <source>Select Workspace Directory</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="8852" /> - <source>Unsaved Data Detected</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="8853" /> + <source>Unsaved Data Detected</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8854" /> <source>Some editors contain unsaved data. Shall these be saved?</source> <translation type="unfinished" /> </message> @@ -100452,8 +100721,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>&Browsing History</source> - <translation type="unfinished">&Procházet historií</translation> + <source>Browsing History</source> + <translation type="unfinished" /> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100492,8 +100761,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>&Search History</source> - <translation type="unfinished">Hi&storie hledání</translation> + <source>Search History</source> + <translation type="unfinished" /> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100502,7 +100771,7 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>Download &History</source> + <source>Download History</source> <translation type="unfinished" /> </message> <message> @@ -100512,8 +100781,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>&Cookies</source> - <translation type="unfinished">&Cookies</translation> + <source>Cookies</source> + <translation type="unfinished" /> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100522,8 +100791,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>Cached &Web Pages</source> - <translation type="unfinished">&Web strany v cache</translation> + <source>Cached Web Pages</source> + <translation type="unfinished" /> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100532,8 +100801,18 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>Website &Icons</source> - <translation type="unfinished">&Ikony webstran</translation> + <source>Website Icons</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> + <source>Select to clear the website permissions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> + <source>Website Permissions</source> + <translation type="unfinished" /> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100542,8 +100821,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>Saved &Passwords</source> - <translation type="unfinished">Uložit &hesla</translation> + <source>Saved Passwords</source> + <translation type="unfinished">Uložená hesla</translation> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100552,7 +100831,7 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>&Zoom Settings</source> + <source>Zoom Settings</source> <translation type="unfinished" /> </message> <message> @@ -100560,6 +100839,30 @@ <source>SSL Certificate Error Exceptions</source> <translation type="unfinished" /> </message> + <message> + <source>&Browsing History</source> + <translation type="vanished">&Procházet historií</translation> + </message> + <message> + <source>&Search History</source> + <translation type="vanished">Hi&storie hledání</translation> + </message> + <message> + <source>&Cookies</source> + <translation type="vanished">&Cookies</translation> + </message> + <message> + <source>Cached &Web Pages</source> + <translation type="vanished">&Web strany v cache</translation> + </message> + <message> + <source>Website &Icons</source> + <translation type="vanished">&Ikony webstran</translation> + </message> + <message> + <source>Saved &Passwords</source> + <translation type="vanished">Uložit &hesla</translation> + </message> </context> <context> <name>WebBrowserJavaScriptConsole</name> @@ -101093,6 +101396,16 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/WebBrowserPage.ui" line="0" /> + <source>Select to store website permission settings in memory only.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserPage.ui" line="0" /> + <source>Do not persist website permissions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserPage.ui" line="0" /> <source><p>Select to allow reading from all canvas elements.</p> <p><b>Note:</b> Disable this option to prevent canvas fingerprinting.</p></source> <translation type="unfinished" /> @@ -101505,32 +101818,87 @@ <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="194" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="78" /> + <source><p>Allow <b>{0}</b> to access your location information?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="83" /> + <source><p>Allow <b>{0}</b> to access your microphone?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="89" /> + <source><p>Allow <b>{0}</b> to access your webcam?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="95" /> + <source><p>Allow <b>{0}</b> to access your microphone and webcam?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="100" /> + <source><p>Allow <b>{0}</b> to lock your mouse cursor?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="105" /> + <source><p>Allow <b>{0}</b> to capture video of your desktop?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="111" /> + <source><p>Allow <b>{0}</b> to capture audio and video of your desktop?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="118" /> + <source><p>Allow <b>{0}</b> to show notifications on your desktop?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="124" /> + <source><p>Allow <b>{0}</b> to read from and write to the clipboard?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="130" /> + <source><p>Allow <b>{0}</b> to access fonts stored on this machine?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="269" /> <source>Suspicuous URL detected</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="195" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="270" /> <source><p>The URL <b>{0}</b> was found in the Safe Browsing database.</p>{1}</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="541" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="396" /> + <source>Permission Request</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="636" /> <source>Register Protocol Handler</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="542" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="637" /> <source><p>Allow the Web Site <b>{0}</b> to handle all <b>{1}</b> links?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="631" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="726" /> <source>SSL Info</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="632" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="727" /> <source>This site does not contain SSL information.</source> <translation type="unfinished" /> </message> @@ -104124,15 +104492,15 @@ <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5231" /> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5221" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5248" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5238" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2220" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2218" /> <source>IP Address Report</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5245" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5262" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2232" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2230" /> <source>Domain Report</source> @@ -104159,8 +104527,8 @@ <translation type="unfinished"><b>Klávesové zkratky</b><p>Nastavení klávesových zkratek aplikace podle zvyklostí uživatele.</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5651" /> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5632" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5675" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5656" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2270" /> <source>Export Keyboard Shortcuts</source> <translation type="unfinished">Exportovat klávesové zkratky</translation> @@ -104181,7 +104549,7 @@ <translation type="unfinished"><b>Export klávesových zkratek</b><p>Exportují se klávesové zkratky z aplikace.</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5671" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5695" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2289" /> <source>Import Keyboard Shortcuts</source> <translation type="unfinished" /> @@ -104431,99 +104799,99 @@ <translation type="unfinished">Engine nápovědy</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4768" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4785" /> <source>System</source> <translation type="unfinished">Systém</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4772" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4789" /> <source>ISO</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4775" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4792" /> <source>Unicode</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4778" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4795" /> <source>Windows</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4781" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4798" /> <source>IBM</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4784" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4801" /> <source>Apple</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4787" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4804" /> <source>Other</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4814" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4831" /> <source>Menu Bar</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4819" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4836" /> <source>Bookmarks</source> <translation type="unfinished">Záložky</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4824" /> - <source>Status Bar</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4839" /> - <source>&Show all</source> - <translation type="unfinished">&Zobrazit vše</translation> - </message> - <message> <location filename="../WebBrowser/WebBrowserWindow.py" line="4841" /> + <source>Status Bar</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4856" /> + <source>&Show all</source> + <translation type="unfinished">&Zobrazit vše</translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4858" /> <source>&Hide all</source> <translation type="unfinished">&Skrýt vše</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5187" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5204" /> <source>VirusTotal Scan</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5188" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5205" /> <source><p>The VirusTotal scan could not be scheduled.<p> <p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5222" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5239" /> <source>Enter a valid IPv4 address in dotted quad notation:</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5232" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5249" /> <source>The given IP address is not in dotted quad notation.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5246" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5263" /> <source>Enter a valid domain name:</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5673" /> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5634" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5697" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5658" /> <source>Keyboard Shortcuts File (*.ekj)</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5652" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5676" /> <source><p>The keyboard shortcuts file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished" /> </message> @@ -105623,38 +105991,38 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1383" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1389" /> <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>Rodič #{0}</b></td><td></td></tr><tr><td><b>Množina změn</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1955" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1391" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1964" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397" /> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Tagy</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1961" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1970" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1403" /> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1968" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1404" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1977" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1410" /> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Větve</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1410" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1416" /> <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> <translation><tr><td><b>Poslední autor</b></td><td>{0}</td></tr><tr><td><b>Datum zapsání změn</b></td><td>{1}</td></tr><tr><td><b>Čas zapsání změn</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1429" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1435" /> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -105665,35 +106033,35 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1929" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1938" /> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1936" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945" /> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1943" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1952" /> <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="1948" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1957" /> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Množina změn</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1975" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1984" /> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Rodiče</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1981" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990" /> <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>
--- a/src/eric7/i18n/eric7_de.ts Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/i18n/eric7_de.ts Tue Jan 14 17:29:56 2025 +0100 @@ -7707,18 +7707,18 @@ <translation>Grafiken</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="896" /> + <location filename="../Preferences/ConfigurationDialog.py" line="903" /> <location filename="../Preferences/ConfigurationDialog.py" line="228" /> <source>Hex Editor</source> <translation>Hex-Editor</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1129" /> - <location filename="../Preferences/ConfigurationDialog.py" line="1090" /> - <location filename="../Preferences/ConfigurationDialog.py" line="982" /> - <location filename="../Preferences/ConfigurationDialog.py" line="944" /> - <location filename="../Preferences/ConfigurationDialog.py" line="913" /> - <location filename="../Preferences/ConfigurationDialog.py" line="882" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1136" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1097" /> + <location filename="../Preferences/ConfigurationDialog.py" line="989" /> + <location filename="../Preferences/ConfigurationDialog.py" line="951" /> + <location filename="../Preferences/ConfigurationDialog.py" line="920" /> + <location filename="../Preferences/ConfigurationDialog.py" line="889" /> <location filename="../Preferences/ConfigurationDialog.py" line="785" /> <location filename="../Preferences/ConfigurationDialog.py" line="670" /> <location filename="../Preferences/ConfigurationDialog.py" line="235" /> @@ -7736,7 +7736,7 @@ <translation>Ausgabefenster</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1104" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1111" /> <location filename="../Preferences/ConfigurationDialog.py" line="250" /> <source>MicroPython</source> <translation>MicroPython</translation> @@ -7753,8 +7753,9 @@ <translation>Netzwerk</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1111" /> - <location filename="../Preferences/ConfigurationDialog.py" line="958" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1118" /> + <location filename="../Preferences/ConfigurationDialog.py" line="965" /> + <location filename="../Preferences/ConfigurationDialog.py" line="806" /> <location filename="../Preferences/ConfigurationDialog.py" line="271" /> <source>Network Proxy</source> <translation>Netzwerkproxy</translation> @@ -7765,13 +7766,13 @@ <translation>Benachrichtigungen</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="927" /> + <location filename="../Preferences/ConfigurationDialog.py" line="934" /> <location filename="../Preferences/ConfigurationDialog.py" line="285" /> <source>PDF Viewer</source> <translation>PDF Anzeige</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="965" /> + <location filename="../Preferences/ConfigurationDialog.py" line="972" /> <location filename="../Preferences/ConfigurationDialog.py" line="292" /> <source>Python Package Management</source> <translation>Python Paketmanagement</translation> @@ -7782,7 +7783,7 @@ <translation>Pluginmanager</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="806" /> + <location filename="../Preferences/ConfigurationDialog.py" line="813" /> <location filename="../Preferences/ConfigurationDialog.py" line="684" /> <location filename="../Preferences/ConfigurationDialog.py" line="306" /> <source>Printer</source> @@ -7799,13 +7800,13 @@ <translation>Qt</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="813" /> + <location filename="../Preferences/ConfigurationDialog.py" line="820" /> <location filename="../Preferences/ConfigurationDialog.py" line="321" /> <source>Security</source> <translation>Sicherheit</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="996" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1003" /> <location filename="../Preferences/ConfigurationDialog.py" line="328" /> <source>Shell</source> <translation>Shell</translation> @@ -7821,7 +7822,7 @@ <translation>Vorlagen</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="865" /> + <location filename="../Preferences/ConfigurationDialog.py" line="872" /> <location filename="../Preferences/ConfigurationDialog.py" line="343" /> <source>Tray Starter</source> <translation>Systemstarter</translation> @@ -7837,7 +7838,7 @@ <translation>Debugger</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1003" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1010" /> <location filename="../Preferences/ConfigurationDialog.py" line="698" /> <location filename="../Preferences/ConfigurationDialog.py" line="399" /> <location filename="../Preferences/ConfigurationDialog.py" line="364" /> @@ -7872,14 +7873,14 @@ <translation>Dateibehandlung</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1010" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1017" /> <location filename="../Preferences/ConfigurationDialog.py" line="712" /> <location filename="../Preferences/ConfigurationDialog.py" line="413" /> <source>Searching</source> <translation>Suchen</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="848" /> + <location filename="../Preferences/ConfigurationDialog.py" line="855" /> <location filename="../Preferences/ConfigurationDialog.py" line="719" /> <location filename="../Preferences/ConfigurationDialog.py" line="648" /> <location filename="../Preferences/ConfigurationDialog.py" line="420" /> @@ -7887,7 +7888,7 @@ <translation>Rechtschreibprüfung</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1017" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1024" /> <location filename="../Preferences/ConfigurationDialog.py" line="726" /> <location filename="../Preferences/ConfigurationDialog.py" line="427" /> <source>Style</source> @@ -7910,14 +7911,14 @@ <translation>Exporter</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1024" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1031" /> <location filename="../Preferences/ConfigurationDialog.py" line="455" /> <source>Autocompletion</source> <translation>Automatische Vervollständigung</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1045" /> - <location filename="../Preferences/ConfigurationDialog.py" line="1031" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1052" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1038" /> <location filename="../Preferences/ConfigurationDialog.py" line="483" /> <location filename="../Preferences/ConfigurationDialog.py" line="462" /> <source>QScintilla</source> @@ -7931,13 +7932,13 @@ <translation>Jedi</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1038" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1045" /> <location filename="../Preferences/ConfigurationDialog.py" line="476" /> <source>Calltips</source> <translation>Calltips</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1052" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1059" /> <location filename="../Preferences/ConfigurationDialog.py" line="740" /> <location filename="../Preferences/ConfigurationDialog.py" line="497" /> <source>Highlighters</source> @@ -7950,21 +7951,21 @@ <translation>Dateitypzuordnungen</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1059" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1066" /> <location filename="../Preferences/ConfigurationDialog.py" line="754" /> <location filename="../Preferences/ConfigurationDialog.py" line="511" /> <source>Styles</source> <translation>Stile</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1066" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1073" /> <location filename="../Preferences/ConfigurationDialog.py" line="761" /> <location filename="../Preferences/ConfigurationDialog.py" line="518" /> <source>Keywords</source> <translation>Schlüsselwörter</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1073" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1080" /> <location filename="../Preferences/ConfigurationDialog.py" line="768" /> <location filename="../Preferences/ConfigurationDialog.py" line="525" /> <source>Properties</source> @@ -7981,7 +7982,7 @@ <translation>Hilfe</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="820" /> + <location filename="../Preferences/ConfigurationDialog.py" line="827" /> <location filename="../Preferences/ConfigurationDialog.py" line="553" /> <source>Help Documentation</source> <translation>Hilfe Dokumentation</translation> @@ -8008,12 +8009,12 @@ <translation>Mehrfachprojekt</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1136" /> - <location filename="../Preferences/ConfigurationDialog.py" line="1097" /> - <location filename="../Preferences/ConfigurationDialog.py" line="989" /> - <location filename="../Preferences/ConfigurationDialog.py" line="951" /> - <location filename="../Preferences/ConfigurationDialog.py" line="920" /> - <location filename="../Preferences/ConfigurationDialog.py" line="889" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1143" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1104" /> + <location filename="../Preferences/ConfigurationDialog.py" line="996" /> + <location filename="../Preferences/ConfigurationDialog.py" line="958" /> + <location filename="../Preferences/ConfigurationDialog.py" line="927" /> + <location filename="../Preferences/ConfigurationDialog.py" line="896" /> <location filename="../Preferences/ConfigurationDialog.py" line="792" /> <location filename="../Preferences/ConfigurationDialog.py" line="677" /> <location filename="../Preferences/ConfigurationDialog.py" line="602" /> @@ -8032,47 +8033,47 @@ <translation>Web Browser</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="827" /> + <location filename="../Preferences/ConfigurationDialog.py" line="834" /> <location filename="../Preferences/ConfigurationDialog.py" line="627" /> <source>Appearance</source> <translation>Erscheinung</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="834" /> - <location filename="../Preferences/ConfigurationDialog.py" line="634" /> - <source>eric Web Browser</source> - <translation>eric Web Browser</translation> - </message> - <message> <location filename="../Preferences/ConfigurationDialog.py" line="841" /> + <location filename="../Preferences/ConfigurationDialog.py" line="634" /> + <source>eric Web Browser</source> + <translation>eric Web Browser</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationDialog.py" line="848" /> <location filename="../Preferences/ConfigurationDialog.py" line="641" /> <source>VirusTotal Interface</source> <translation>VirusTotal-Schnittstelle</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1228" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1235" /> <source>Enter search text...</source> <translation>Suchtext eingeben...</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1303" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1310" /> <source>Preferences</source> <translation>Einstellungen</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1309" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1316" /> <source>Please select an entry of the list to display the configuration page.</source> <translation>Wähle einen Listeneintrag aus, um die Konfigurationsseite anzuzeigen.</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1392" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1399" /> <source>Configuration Page Error</source> <translation>Konfigurationsseitenfehler</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1393" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1400" /> <source><p>The configuration page <b>{0}</b> could not be loaded.</p></source> <translation><p>Die Konfigurationsseite <b>{0}</b> konnte nicht geladen werden.</p></translation> </message> @@ -10636,12 +10637,12 @@ <translation><p>Remote Debugging is aktiviert aber es wurde kein Befehl zum Anmelden angegeben.</p></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="1691" /> + <location filename="../Debugger/DebuggerInterfacePython.py" line="1692" /> <source>Debug Protocol Error</source> <translation>Fehler im Debugprotokoll</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="1692" /> + <location filename="../Debugger/DebuggerInterfacePython.py" line="1693" /> <source><p>The response received from the debugger backend could not be decoded. Please report this issue with the received data to the eric bugs email address.</p><p>Error: {0}</p><p>Data:<br/>{1}</p></source> <translation><p>Die vom Debugger empfangene Antwort konnte nicht dekodiert werden. Bitte berichten sie diesen Fehler zusammen mit den empfangenen Daten an die eric Bugs Emailadresse.</p><p>Fehler: {0}</p><p>Daten:<br/>{1}</p></translation> </message> @@ -22678,64 +22679,147 @@ </message> </context> <context> + <name>Fastexport</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="183" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="174" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="168" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="159" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="133" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="113" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="57" /> + <source>Mercurial Fastexport</source> + <translation>Mercurial Fastexport</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="58" /> + <source><p>The output file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation><p>Die Ausgabedatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="107" /> + <source>Cancel</source> + <translation>Abbrechen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="110" /> + <source>%v/%m Changesets</source> + <translation>%v/%m Änderungssätze</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="116" /> + <source>Exporting repository (time remaining: {0}) ...</source> + <translation>Exportiere Repository (verbleibende Zeit: {0}) ...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="134" /> + <source><p>The repository fastexport process sent an error message.</p><p>{0}</p></source> + <translation><p>Der 'fastexport' Prozess hat eine Fehlermeldung übertragen.</p><p>{0}</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="160" /> + <source><p>The repository fastexport process finished successfully.</p></source> + <translation><p>Der 'fastexport' Prozess wurde erfolgreich beendet.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="169" /> + <source><p>The repository fastexport process was cancelled.</p></source> + <translation><p>Der 'fastexport' Prozess wurde abgebrochen.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="175" /> + <source><p>The repository fastexport process finished with exit code <b>{0}</b>.</p></source> + <translation><p>Der 'fastexport' Prozess wurde mit dem Code <b>{0}</b> beendet.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="184" /> + <source><p>The repository fastexport process crashed.</p></source> + <translation><p>Der 'fastexport' Prozess ist abgestürzt.</p></translation> + </message> + </context> + <context> + <name>FastexportProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="37" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="35" /> + <source>Export to git</source> + <translation>Nach git exportieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="44" /> + <source>Export the repository as git fast-import stream.</source> + <translation>Das Repository in eine 'git fast-import' Datei exportieren.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="47" /> + <source><b>Export to git</b><p>This exports the repository as a git fast-import stream.</p></source> + <translation><b>Nach git exportieren</b><p>Dies exportiert das Repository in eine 'git fast-import' Datei.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="79" /> + <source>Fastexport</source> + <translation>Fastexport</translation> + </message> + </context> + <context> <name>FeaturePermissionBar</name> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="48" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="50" /> <source>{0} wants to use your position.</source> <translation>{0} möchte die Position nutzen.</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="51" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="53" /> <source>{0} wants to use your microphone.</source> <translation>{0} möchte das Mikrofon nutzen.</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="54" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="56" /> <source>{0} wants to use your camera.</source> <translation>{0} möchte die Kamera nutzen.</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="57" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="59" /> <source>{0} wants to use your microphone and camera.</source> <translation>{0} möchte das Mikrofon und die Kamera nutzen.</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="60" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="62" /> <source>{0} wants to lock your mouse.</source> <translation>{0} möchte die Maus sperren.</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="61" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="63" /> <source>{0} wants to capture video of your screen.</source> <translation>{0} möchte deinen Bildschirminhalt erfassen.</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="64" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="66" /> <source>{0} wants to capture audio and video of your screen.</source> <translation>{0} möchte deine Audioausgabe und deinen Bildschirminhalt erfassen.</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="67" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="69" /> <source>{0} wants to use desktop notifications.</source> <translation>{0} möchte Desktopmitteilungen nutzen.</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="92" /> - <source>Remember</source> - <translation>Merken</translation> - </message> - <message> <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="94" /> + <source>Remember</source> + <translation>Merken</translation> + </message> + <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="96" /> <source>Allow</source> <translation>Erlauben</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="95" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="97" /> <source>Deny</source> <translation>Ablehnen</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="120" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="122" /> <source>{0} wants to use an unknown feature.</source> <translation>{0} möchte ein unbekanntes Feature nutzen.</translation> </message> @@ -22743,80 +22827,106 @@ <context> <name>FeaturePermissionsDialog</name> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="161" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="143" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="127" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="109" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="93" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="79" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="65" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="49" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="208" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="190" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="170" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="152" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="136" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="118" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="102" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="88" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="74" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="58" /> <source>Host</source> <translation>Rechner</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="162" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="144" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="128" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="110" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="94" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="80" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="66" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="50" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="209" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="191" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="171" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="153" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="137" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="119" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="103" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="89" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="75" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="59" /> <source>Permission</source> <translation>Berechtigung</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="54" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="63" /> <source>Notifications</source> <translation>Benachrichtigungen</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="68" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="77" /> <source>Geolocation</source> <translation>Geolokalisierung</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="82" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="91" /> <source>Microphone</source> <translation>Mikrofon</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="96" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="105" /> <source>Camera</source> <translation>Kamera</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="114" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="123" /> <source>Microphone && Camera</source> <translation>Mikrofon && Kamera</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="130" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="139" /> <source>Mouse Lock</source> <translation>Maussperre</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="148" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="157" /> <source>Desktop Video</source> <translation>Bildschirminhalt</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="166" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="175" /> <source>Desktop Audio && Video</source> <translation>Bildschirmaudio && -inhalt</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="181" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="195" /> + <source>Clipboard</source> + <translation>Zwischenablage</translation> + </message> + <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="213" /> + <source>Local Fonts</source> + <translation>Lokale Schriften</translation> + </message> + <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="296" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="253" /> <source>Allow</source> <translation>Erlauben</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="182" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="297" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="254" /> <source>Deny</source> <translation>Ablehnen</translation> </message> <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="255" /> + <source>Always Ask</source> + <translation>Immer fragen</translation> + </message> + <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="256" /> + <source>Invalid</source> + <translation>Ungültig</translation> + </message> + <message> <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.ui" line="0" /> <source>HTML5 Feature Permissions</source> <translation>HTML5 Feature Berechtigungen</translation> @@ -24688,23 +24798,23 @@ <translation>{0} ({1})</translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="750" /> + <location filename="../UI/FindFileWidget.py" line="749" /> <source>Invalid search expression</source> <translation>Ungültiger Suchausdruck</translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="751" /> + <location filename="../UI/FindFileWidget.py" line="750" /> <source><p>The search expression is not valid.</p><p>Error: {0}</p></source> <translation><p>Der Suchausdruck ist nicht gültig.</p><p>Fehler: {0}</p></translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="878" /> + <location filename="../UI/FindFileWidget.py" line="877" /> <source>{0} / {1}</source> <comment>occurrences / files</comment> <translation>{0} / {1}</translation> </message> <message numerus="yes"> - <location filename="../UI/FindFileWidget.py" line="881" /> + <location filename="../UI/FindFileWidget.py" line="880" /> <source>%n occurrence(s)</source> <translation> <numerusform>ein Vorkommen</numerusform> @@ -24712,7 +24822,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../UI/FindFileWidget.py" line="882" /> + <location filename="../UI/FindFileWidget.py" line="881" /> <source>%n file(s)</source> <translation> <numerusform>eine Datei</numerusform> @@ -24720,44 +24830,44 @@ </translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1081" /> - <location filename="../UI/FindFileWidget.py" line="1056" /> - <location filename="../UI/FindFileWidget.py" line="1042" /> + <location filename="../UI/FindFileWidget.py" line="1080" /> + <location filename="../UI/FindFileWidget.py" line="1055" /> + <location filename="../UI/FindFileWidget.py" line="1041" /> <source>Replace in Files</source> <translation>Ersetzen in Dateien</translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1043" /> + <location filename="../UI/FindFileWidget.py" line="1042" /> <source><p>Could not read the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation><p>Die Datei <b>{0}</b> konnte nicht gelesen werden. Überspringe sie.</p><p>Ursache: {1}</p></translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1057" /> + <location filename="../UI/FindFileWidget.py" line="1056" /> <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>Der aktuelle und der originale Hash-Wert der Datei <b>{0}</b> sind unterschiedlich. Überspringe sie.</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p></translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1082" /> + <location filename="../UI/FindFileWidget.py" line="1081" /> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation><p>Die Datei <b>{0}</b> konnte nicht gespeichert werden. Überspringe sie.</p><p>Ursache: {1}</p></translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1111" /> + <location filename="../UI/FindFileWidget.py" line="1110" /> <source>Open</source> <translation>Öffnen</translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1113" /> + <location filename="../UI/FindFileWidget.py" line="1112" /> <source>Copy Path to Clipboard</source> <translation>Pfad in die Zwischenablage kopieren</translation> </message> <message> + <location filename="../UI/FindFileWidget.py" line="1116" /> + <source>Select All</source> + <translation>Alle anwählen</translation> + </message> + <message> <location filename="../UI/FindFileWidget.py" line="1117" /> - <source>Select All</source> - <translation>Alle anwählen</translation> - </message> - <message> - <location filename="../UI/FindFileWidget.py" line="1118" /> <source>Deselect All</source> <translation>Alle abwählen</translation> </message> @@ -26951,37 +27061,37 @@ <translation>Alt+K</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="91" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="94" /> <source>Additional Output</source> <translation>Zusätzliche Ausgabe</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="110" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="113" /> <source>Process canceled.</source> <translation>Vorgang abgebrochen.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="124" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="127" /> <source>Process finished successfully.</source> <translation>Vorgang erfolgreich beendet.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="126" /> - <source>Process crashed.</source> - <translation>Prozess gestorben.</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="129" /> + <source>Process crashed.</source> + <translation>Prozess gestorben.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="132" /> <source>Process finished with exit code {0}</source> <translation>Prozess endete mit Code {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="195" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="198" /> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="196" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="199" /> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> @@ -35362,456 +35472,456 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="303" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="309" /> <source>Create project repository</source> <translation>Projektrepository anlegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="304" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="310" /> <source>The project repository could not be created.</source> <translation>Das Projektrepository konnte nicht erzeugt werden.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="338" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="344" /> <source>Creating Mercurial repository</source> <translation>Lege Mercurial-Repository an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="359" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="365" /> <source>Initial commit to Mercurial repository</source> <translation>Erstes Commit für das Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="405" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="411" /> <source>Cloning project from a Mercurial repository</source> <translation>Klone das Projekt aus dem Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="516" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="522" /> <source>Commit Changes</source> <translation>Änderungen einpflegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="517" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="523" /> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation>Das Einpflegen von Änderungen betrifft Dateien mit ungesicherten Änderungen. Soll die Aktion fortgesetzt werden?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="580" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="586" /> <source>Committing changes to Mercurial repository</source> <translation>Pflege Änderungen in das Mercurial-Repository ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="679" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="685" /> <source>Synchronizing with the Mercurial repository</source> <translation>Gleiche mit dem Mercurial-Repository ab</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="719" /> <source>Adding files/directories to the Mercurial repository</source> <translation>Füge Dateien/Verzeichnisse dem Mercurial-Repository hinzu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="774" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="780" /> <source>Removing files/directories from the Mercurial repository</source> <translation>Lösche Dateien/Verzeichnisse aus dem Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="829" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="835" /> <source>Renaming {0}</source> <translation>Benenne {0} um</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="964" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="970" /> <source>Tagging in the Mercurial repository</source> <translation>Marke im Mercurial-Repository setzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1011" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1000" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1017" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006" /> <source>Revert changes</source> <translation>Änderungen rückgängig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1001" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1007" /> <source>Do you really want to revert all changes to these files or directories?</source> <translation>Wollen Sie wirklich alle Änderungen an den folgenden Datein oder Verzeichnissen rückgängig machen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1012" /> - <source>Do you really want to revert all changes of the project?</source> - <translation>Wollen Sie wirklich alle Änderungen des Projektes rückgängig machen?</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1018" /> + <source>Do you really want to revert all changes of the project?</source> + <translation>Wollen Sie wirklich alle Änderungen des Projektes rückgängig machen?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1024" /> <source>Reverting changes</source> <translation>Mache Änderungen rückgängig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1064" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1070" /> <source>Merging</source> <translation>Zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1095" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1109" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101" /> <source>Re-Merge</source> <translation>Neu zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1102" /> <source>Do you really want to re-merge these files or directories?</source> <translation>Wollen Sie wirklich diese Dateien oder Verzeichnisse neu zusammenführen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1104" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1110" /> <source>Do you really want to re-merge the project?</source> <translation>Wollen Sie wirklich das Projekt neu zusammenführen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1114" /> <source>Re-Merging</source> <translation>Neu zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1131" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1137" /> <source>Current branch tip</source> <translation>Spitze des aktuellen Zweigs</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1314" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1320" /> <source>Mercurial command</source> <translation>Mercurial-Befehl</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1492" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1498" /> <source>Copying {0}</source> <translation>Kopiere {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1758" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1746" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1764" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1752" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743" /> <source>Mercurial Side-by-Side Difference</source> <translation>Mercurial Unterschiede nebeneinander anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1759" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1765" /> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>Die Datei <b>{0}</b> konnte nicht gelesen werden.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2457" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2446" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2436" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1835" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2455" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844" /> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1838" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1847" /> <source>Pulling from a remote Mercurial repository</source> <translation>Pull von einem entfernten Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1884" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1893" /> <source>Pushing to a remote Mercurial repository</source> <translation>Push in ein entferntes Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2027" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2036" /> <source>Marking as 'unresolved'</source> <translation>Markiere als 'nicht aufgelöst'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2029" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038" /> <source>Marking as 'resolved'</source> <translation>Markiere als 'aufgelöst'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2051" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060" /> <source>Aborting uncommitted merge</source> <translation>Breche Zusammenführung ab</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2084" /> <source>Creating branch in the Mercurial repository</source> <translation>Erzeuge Zweig im Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086" /> - <source>Created new branch <{0}>.</source> - <translation>Neuer Zweig <{0}> wurde angelegt.</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2095" /> + <source>Created new branch <{0}>.</source> + <translation>Neuer Zweig <{0}> wurde angelegt.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2104" /> <source>Showing current branch</source> <translation>Zeige aktuellen Zweig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2184" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193" /> <source>Verifying the integrity of the Mercurial repository</source> <translation>Verifiziere die Integrität des Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2200" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209" /> <source>Showing the combined configuration settings</source> <translation>Zeige die kombinierten Einstellungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2224" /> <source>Showing aliases for remote repositories</source> <translation>Zeige Namen für entfernte Repositorys</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2230" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239" /> <source>Recovering from interrupted transaction</source> <translation>Setze abgebrochene Transaktion zurück</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254" /> <source>Identifying project directory</source> <translation>Projektverzeichnis identifizieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2291" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2300" /> <source>Create .hgignore file</source> <translation>.hgignore-Datei erstellen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2292" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301" /> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2395" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2369" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2351" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2404" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2378" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2360" /> <source>Create changegroup</source> <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2353" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362" /> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial-Änderungsgruppendateien (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2370" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2379" /> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Die Mercurial-Änderungsgruppendatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2409" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2418" /> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2438" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2411" /> - <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> - <translation>Mercurial-Änderungsgruppendateien (*.hg);;Alle Dateien (*)</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2447" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2420" /> + <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> + <translation>Mercurial-Änderungsgruppendateien (*.hg);;Alle Dateien (*)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2456" /> <source>Shall the working directory be updated?</source> <translation>Soll das Arbeitsverzeichnis aktualisiert werden?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2479" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2488" /> <source>Bisect subcommand ({0}) invalid.</source> <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2501" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2510" /> <source>Mercurial Bisect ({0})</source> <translation>Mercurial-Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2527" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2536" /> <source>Removing files from the Mercurial repository only</source> <translation>Lösche Dateien nur aus dem Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2576" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2557" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2585" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2566" /> <source>Backing out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2558" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2567" /> <source>No revision given. Aborting...</source> <translation>Keine Revision angegeben. Abbruch...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2587" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2602" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2596" /> <source>Rollback last transaction</source> <translation>Letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2588" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2597" /> <source>Are you sure you want to rollback the last transaction?</source> <translation>Wollen Sie die letzte Transaktion wirklich zurücksetzen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2657" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2666" /> <source>Import Patch</source> <translation>Patch importieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2707" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2716" /> <source>Export Patches</source> <translation>Patches exportieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2749" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2758" /> <source>Change Phase</source> <translation>Phase ändern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2804" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813" /> <source>Copy Changesets</source> <translation>Änderungssätze kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2843" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2852" /> <source>Copy Changesets (Continue)</source> <translation>Änderungssätze kopieren (Fortsetzung)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2853" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2862" /> <source>Copy Changesets (Stop)</source> <translation>Änderungssätze kopieren (Stopp)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2863" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2872" /> <source>Copy Changesets (Abort)</source> <translation>Änderungssätze kopieren (Abbruch)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2887" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2896" /> <source>Create Unversioned Archive</source> <translation>Erzeuge nicht versioniertes Archiv</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2902" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2911" /> <source>Delete All Backups</source> <translation>Alle Backups löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2903" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2912" /> <source><p>Do you really want to delete all backup bundles stored in the backup area?<br/><b>{0}</b></p></source> <translation><p>Sollen wirklich alle Backupdateien des Backupbereiches gelöscht werden?<br/><b>{0}</b></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2994" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2974" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2963" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2983" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2972" /> <source>Add Sub-repository</source> <translation>Unterrepository hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3033" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2964" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3042" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2973" /> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation><p>Die Unterrepositorydatei .hgsub konnte nicht gelesen werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2975" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2984" /> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation><p>Die Unterrepositorydatei .hgsub enthält bereits einen Eintrag <b>{0}</b>. Abbruch...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3051" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3060" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3004" /> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation><p>Die Unterrepositorydatei .hgsub konnte nicht gespeichert werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3050" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3032" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3018" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3059" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3027" /> <source>Remove Sub-repositories</source> <translation>Unterrepositorys löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3019" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3028" /> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation><p>Die Unterrepositorydatei .hgsub existiert nicht. Abbruch...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3296" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3138" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3147" /> <source>Mercurial Command Server</source> <translation>Mercurial-Befehlsserver</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3139" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3148" /> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation><p>Der Mercurial-Befehlsserver konnte nicht wiedergestartet werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3297" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3321" /> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation><p>Der Mercurial-Befehlsserver konnte nicht gestartet werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3420" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3444" /> <source>Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3437" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3461" /> <source>Delete Bookmark</source> <translation>Lesezeichen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3438" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3462" /> <source>Select the bookmark to be deleted:</source> <translation>Wähle das zu löschende Lesezeichen aus:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3449" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3473" /> <source>Delete Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3476" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3500" /> <source>Rename Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen umbenennen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3518" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3542" /> <source>Move Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen verschieben</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3600" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3624" /> <source>Pull Bookmark</source> <translation>Lesezeichen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3601" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3625" /> <source>Select the bookmark to be pulled:</source> <translation>Wähle das herunterzuladende Lesezeichen:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3613" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3637" /> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>Lade Lesezeichen von einem entfernten Mercurial-Repository herunter</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3641" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3665" /> <source>Push Bookmark</source> <translation>Lesezeichen hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3642" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3666" /> <source>Select the bookmark to be push:</source> <translation>Wähle das hochzuladende Lesezeichen:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3657" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3681" /> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Lade Lesezeichen zu einem entfernten Mercurial-Repository hoch</translation> </message> @@ -36657,42 +36767,42 @@ <context> <name>HgClient</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="98" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="100" /> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="147" /> - <source>Did not receive the 'hello' message.</source> - <translation>„Hallo“-Nachricht konnte nicht empfangen werden.</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="149" /> + <source>Did not receive the 'hello' message.</source> + <translation>„Hallo“-Nachricht konnte nicht empfangen werden.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="151" /> <source>Received data on unexpected channel.</source> <translation>Daten auf unerwartetem Kanal empfangen.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="154" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="156" /> <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> <translation>Ungültige „Hallo“-Nachricht; Erwartete „capabilities: “, empfing jedoch „{0}“.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="159" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="161" /> <source>'capabilities' message did not contain any capability.</source> <translation>„capabilities“-Nachricht enthielt keine Fähigkeiten.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="168" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="170" /> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation>Ungültige „Hallo“-Nachricht; Erwartete „encoding: “, empfing jedoch „{0}“.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="173" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="175" /> <source>'encoding' message did not contain any encoding.</source> <translation>„encoding“-Nachricht enthielt keine Kodierung.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="385" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="387" /> <source>For message see output dialog.</source> <translation>Nachricht siehe Ausgabedialog.</translation> </message> @@ -37060,6 +37170,11 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="0" /> + <source>%v/%m</source> + <translation>%v/%m</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="0" /> <source>Errors</source> <translation>Fehler</translation> </message> @@ -37103,6 +37218,11 @@ <source>Alt+P</source> <translation>Alt+K</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="211" /> + <source>Time remaining: {0}</source> + <translation>Verbleibende Zeit: {0}</translation> + </message> </context> <context> <name>HgDiffDialog</name> @@ -37296,6 +37416,69 @@ </message> </context> <context> + <name>HgFastexportConfigDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>fastexport Configuration</source> + <translation>'fastexport' Konfiguration</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the path of the file for the exported marks.</source> + <translation>Gib den Pfad der Datei für die exportierten Marken an.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the path of the output file.</source> + <translation>Gib den Pfad der Ausgabedatei ein.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Revisions:</source> + <translation>Revisionen:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the path of the file containing already exported marks.</source> + <translation>Gib den Pfad der Datei an, die bereits exportierte Marken enthält.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Author Map:</source> + <translation>Autorenzuordnung:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Import Marks:</source> + <translation>Bereits exportierte Marken:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Export Marks:</source> + <translation>Neu exportierte Marken:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Output File:</source> + <translation>Ausgabedatei:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the revisions, tags or branches to be exported (separated by comma).</source> + <translation>Gib die zu exportierenden Revisionen, Marken oder Zweige ein (Komma separiert).</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the path of the author map file.</source> + <translation>Gib den Pfad der Datei für die Autorenzuordnung ein.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.py" line="42" /> + <source>Text Files (*.txt);;All Files (*)</source> + <translation>Textdateien (*.txt);;Alle Dateien (*)</translation> + </message> + </context> + <context> <name>HgGpgSignDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="0" /> @@ -38107,7 +38290,7 @@ <translation>Ansicht</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3049" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3063" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298" /> <source>Select Branches</source> <translation>Zweige auswählen</translation> @@ -38148,7 +38331,7 @@ <translation>Wähle die anzuzeigenden Zweige aus einer Liste geschlossener Zweigen und erneuere den Dialog</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2218" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2227" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> <source>Copy Changesets</source> <translation>Änderungssätze kopieren</translation> @@ -38205,8 +38388,8 @@ <translation>Schließe die ausgewählten Köpfe</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2312" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2295" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2321" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2304" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="387" /> <source>Switch</source> <translation>Umschalten</translation> @@ -38237,264 +38420,271 @@ <translation>Verschiebe ein Lesezeichen zur ausgewählten Revision</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2430" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1622" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="415" /> - <source>Pull Changes</source> - <translation>Änderungen herunterladen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="418" /> - <source>Pull changes from a remote repository</source> - <translation>Änderungen von einem entfernten Repository herunterladen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="420" /> + <source>Pull Selected Changes</source> + <translation>Ausgewählte Änderungen herunterladen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="419" /> + <source>Pull selected changes from a remote repository</source> + <translation>Ausgewählte Änderungen von einem entfernten Repository herunterladen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="423" /> + <source>Pull All Changes</source> + <translation>Alle Änderungen herunterladen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="427" /> + <source>Pull all changes from a remote repository</source> + <translation>Alle Änderungen von einem entfernten Repository herunterladen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="430" /> <source>Pull Large Files</source> <translation>Binärriesen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="422" /> - <source>Pull large files for selected revisions</source> - <translation>Binärriesen der ausgewählten Revisionen herunterladen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="428" /> - <source>Push Selected Changes</source> - <translation>Ausgewählte Änderungen hochladen</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="432" /> - <source>Push changes of the selected changeset and its ancestors to a remote repository</source> - <translation>Änderungen des ausgewählten Änderungssatzes und aller Vorgänger in ein entferntes Repository hochladen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="439" /> - <source>Push All Changes</source> - <translation>Alle Änderungen hochladen</translation> + <source>Pull large files for selected revisions</source> + <translation>Binärriesen der ausgewählten Revisionen herunterladen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="438" /> + <source>Push Selected Changes</source> + <translation>Ausgewählte Änderungen hochladen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="442" /> - <source>Push all changes to a remote repository</source> - <translation>Alle Änderungen an ein entferntes Repository hochladen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="448" /> - <source>Create Changegroup</source> - <translation>Änderungsgruppe erzeugen</translation> + <source>Push changes of the selected changeset and its ancestors to a remote repository</source> + <translation>Änderungen des ausgewählten Änderungssatzes und aller Vorgänger in ein entferntes Repository hochladen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="449" /> + <source>Push All Changes</source> + <translation>Alle Änderungen hochladen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="452" /> + <source>Push all changes to a remote repository</source> + <translation>Alle Änderungen an ein entferntes Repository hochladen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="458" /> + <source>Create Changegroup</source> + <translation>Änderungsgruppe erzeugen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="462" /> <source>Create a changegroup file containing the selected changesets</source> <translation>Erzeuge eine Änderungsgruppendatei für die ausgewählten Änderungssätze</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="455" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="465" /> <source><b>Create Changegroup</b> <p>This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.</p></source> <translation><b>Änderungsgruppe erzeugen</b> <p>Dies erzeugt eine Änderungsgruppendatei für die ausgewählten Änderungssätze. Ist keine Änderung ausgewählt, werden alle in die Datei geschrieben. Ist ein Änderungssatz ausgewählt, so wird er als Basis verwendet. Ansonsten wird die kleinste, ausgewählte Revision als Basis verwendet und alle anderen werden in die Datei geschrieben. Zeigt der Dialog ausgehende Änderungssätze an, so werden alle ausgewählten in die Datei geschrieben.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2569" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="468" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2583" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="478" /> <source>Apply Changegroup</source> <translation>Änderungsgruppe anwenden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="472" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="482" /> <source>Apply the currently viewed changegroup file</source> <translation>Wende die aktuell inspizierte Änderungsgruppendatei an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="489" /> <source>Sign Revisions</source> <translation>Revisionen signieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="483" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="493" /> <source>Add a signature for the selected revisions</source> <translation>Den ausgewählten Revisionen eine Signatur hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="487" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="497" /> <source>Verify Signatures</source> <translation>Signaturen verifizieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="491" /> - <source>Verify all signatures there may be for the selected revision</source> - <translation>Alle Signaturen der ausgewählten Revision verifizieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2476" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498" /> - <source>Strip Changesets</source> - <translation>Änderungssätze löschen</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="501" /> + <source>Verify all signatures there may be for the selected revision</source> + <translation>Alle Signaturen der ausgewählten Revision verifizieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="508" /> + <source>Strip Changesets</source> + <translation>Änderungssätze löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="511" /> <source>Strip changesets from a repository</source> <translation>Änderungssätze aus einem Repository löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="506" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="516" /> <source>Select All Entries</source> <translation>Alle Einträge auswählen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="509" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="519" /> <source>Deselect All Entries</source> <translation>Alle Einträge abwählen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="958" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="934" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="911" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="885" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="968" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="944" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="921" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="895" /> <source>Mercurial Error</source> <translation>Mercurial-Fehler</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1266" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1276" /> <source>{0} (large file)</source> <translation>{0} (Binärriese)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1532" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1542" /> <source>Side-by-Side Diff to Parent {0}</source> <translation>Unterschiede nebeneinander zu Vorgänger {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1543" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1553" /> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation><a href="sbsdiff:{0}_{1}">Unterschiede nebeneinander</a></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1701" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1620" /> - <source>Pull Selected Changes</source> - <translation>Ausgewählte Änderungen herunterladen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2570" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2477" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2431" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2313" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2219" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2584" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2491" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2322" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2228" /> <source>The project should be reread. Do this now?</source> <translation>Das Projekt sollte neu gelesen werde. Jetzt durchführen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2296" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2305" /> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation>Wähle das Lesezeichen aus, auf das umgeschaltet werden soll (leer lassen, um Revision zu verwenden):</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2341" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2350" /> <source>Define Bookmark</source> <translation>Lesezeichen hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2342" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2351" /> <source>Enter bookmark name for changeset "{0}":</source> <translation>Gib einen Lesezeichennamen für den Änderungssatz "{0}" ein:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2371" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2380" /> <source>Move Bookmark</source> <translation>Lesezeichen verschieben</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2372" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2381" /> <source>Select the bookmark to be moved to changeset '{0}':</source> <translation>Wähle ein Lesezeichen aus, das zum Änderungssatz '{0}' verschoben werden soll:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2444" /> + <source>Pull Changes</source> + <translation>Änderungen herunterladen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2727" /> <source>Find Commit</source> <translation>Revision finden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2714" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728" /> <source>'{0}' was not found.</source> <translation>„{0}“ wurde nicht gefunden.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2774" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2788" /> <source>Generating differences ...</source> <translation>Erzeuge Unterschiede ...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2775" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2789" /> <source>Differences</source> <translation>Unterschiede</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2794" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2808" /> <source>No differences available. Get some more log entries.</source> <translation>Keine Unterschiede verfügbar. Lade weitere Log-Einträge.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2796" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2810" /> <source>No differences available.</source> <translation>Keine Unterschiede verfügbar.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2807" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2821" /> <source>Differences to Parent {0}</source> <translation>Unterschiede zu Vorgänger {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2823" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2837" /> <source>Diff to Parent {0}{1}</source> <translation>Diff zu Vorgänger {0}{1}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2846" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2860" /> <source>There is no difference.</source> <translation>Es gibt keinen Unterschied.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2999" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2983" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2965" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3013" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2997" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2979" /> <source>Save Diff</source> <translation>Diff speichern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2967" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2981" /> <source>Patch Files (*.diff)</source> <translation>Patchdateien (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2984" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2998" /> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Die Patchdatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3000" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3014" /> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation><p>Die Patchdatei <b>{0}</b> konnte nicht gespeichert werden.<br>Grund: {1}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3031" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3045" /> <source>closed</source> <translation>geschlossen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3032" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3046" /> <source>inactive</source> <translation>inaktiv</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3041" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3055" /> <source>{0} ({1})</source> <translation>{0} ({1})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3050" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3064" /> <source>Select the branches to be shown (none for 'All'):</source> <translation>Wähle die anzuzeigenden Zweige (keinen für 'Alle'):</translation> </message> @@ -39009,208 +39199,213 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="282" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="309" /> + <source>Other Functions</source> + <translation>Weitere Funktionen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="335" /> <source>Extensions</source> <translation>Erweiterungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="718" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="604" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="556" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="451" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="308" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="774" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="659" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="611" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="505" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="361" /> <source>Version Control</source> <translation>Versionskontrolle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="734" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="620" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="467" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="324" /> - <source>Commit changes to repository...</source> - <translation>Änderungen einpflegen...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="742" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="628" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="475" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="332" /> - <source>Add to repository</source> - <translation>Zum Repository hinzufügen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="748" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="481" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="338" /> - <source>Remove from repository (and disk)</source> - <translation>Vom Repository (und der Platte) löschen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1012" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="999" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="487" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="344" /> - <source>Remove from repository only</source> - <translation>Nur vom Repository löschen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="639" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="349" /> - <source>Copy</source> - <translation>Kopieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="641" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="351" /> - <source>Move</source> - <translation>Verschieben</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="646" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="356" /> - <source>Show log browser</source> - <translation>Zeige Log Browser</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="755" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="653" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="494" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="363" /> - <source>Show status</source> - <translation>Status anzeigen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="762" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="660" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="501" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="370" /> - <source>Show differences</source> - <translation>Unterschiede anzeigen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="376" /> - <source>Show differences side-by-side</source> - <translation>Unterschiede nebeneinander anzeigen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="768" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="666" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="507" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="382" /> - <source>Show differences (extended)</source> - <translation>Unterschiede anzeigen (erweitert)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="388" /> - <source>Show differences side-by-side (extended)</source> - <translation>Unterschiede nebeneinander anzeigen (erweitert)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="394" /> - <source>Show annotated file</source> - <translation>Zeige kommentierte Datei</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="398" /> - <source>Show annotated file with skip list</source> - <translation>Zeige kommentierte Datei mit Ignorierliste</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="402" /> - <source>Create skip list file</source> - <translation>Erzeuge Ignorierlistendatei</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="775" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="673" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="514" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="408" /> - <source>Revert changes</source> - <translation>Änderungen rückgängig</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="779" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="677" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="518" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="412" /> - <source>Conflicts resolved</source> - <translation>Konflikte gelöst</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="781" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="679" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="520" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="414" /> - <source>Conflicts unresolved</source> - <translation>Konflikte ungelöst</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="783" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="681" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="522" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="416" /> - <source>Re-Merge</source> - <translation>Neu zusammenführen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="787" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="685" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="571" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="526" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="420" /> - <source>Select all local file entries</source> - <translation>Alle lokalen Dateieinträge auswählen</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="790" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="688" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="574" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="529" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="423" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="675" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="521" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="377" /> + <source>Commit changes to repository...</source> + <translation>Änderungen einpflegen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="799" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="684" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="530" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="386" /> + <source>Add to repository</source> + <translation>Zum Repository hinzufügen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="805" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="690" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="536" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="392" /> + <source>Remove from repository (and disk)</source> + <translation>Vom Repository (und der Platte) löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1069" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1056" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="542" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="398" /> + <source>Remove from repository only</source> + <translation>Nur vom Repository löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="695" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="403" /> + <source>Copy</source> + <translation>Kopieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="697" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="405" /> + <source>Move</source> + <translation>Verschieben</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="702" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="410" /> + <source>Show log browser</source> + <translation>Zeige Log Browser</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="812" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="709" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="549" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="417" /> + <source>Show status</source> + <translation>Status anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="819" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="716" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="556" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="424" /> + <source>Show differences</source> + <translation>Unterschiede anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="430" /> + <source>Show differences side-by-side</source> + <translation>Unterschiede nebeneinander anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="825" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="722" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="562" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="436" /> + <source>Show differences (extended)</source> + <translation>Unterschiede anzeigen (erweitert)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="442" /> + <source>Show differences side-by-side (extended)</source> + <translation>Unterschiede nebeneinander anzeigen (erweitert)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="448" /> + <source>Show annotated file</source> + <translation>Zeige kommentierte Datei</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="452" /> + <source>Show annotated file with skip list</source> + <translation>Zeige kommentierte Datei mit Ignorierliste</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="456" /> + <source>Create skip list file</source> + <translation>Erzeuge Ignorierlistendatei</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="832" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="729" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="569" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="462" /> + <source>Revert changes</source> + <translation>Änderungen rückgängig</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="836" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="733" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="573" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="466" /> + <source>Conflicts resolved</source> + <translation>Konflikte gelöst</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="735" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="575" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="468" /> + <source>Conflicts unresolved</source> + <translation>Konflikte ungelöst</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="840" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="737" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="577" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="470" /> + <source>Re-Merge</source> + <translation>Neu zusammenführen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="844" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="741" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="581" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="474" /> + <source>Select all local file entries</source> + <translation>Alle lokalen Dateieinträge auswählen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="847" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="744" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="629" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="584" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="477" /> <source>Select all versioned file entries</source> <translation>Alle versionierten Dateieinträge auswählen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="793" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="691" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="577" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="532" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="426" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="850" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="747" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="632" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="587" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="480" /> <source>Select all local directory entries</source> <translation>Alle lokalen Verzeichniseinträge auswählen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="797" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="695" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="581" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="536" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="430" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="854" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="751" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="591" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="484" /> <source>Select all versioned directory entries</source> <translation>Alle versionierten Verzeichniseinträge auswählen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="801" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="699" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="585" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="540" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="434" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="858" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="755" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="640" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="595" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="488" /> <source>Configure...</source> <translation>Einstellungen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="916" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="973" /> <source>Create {0} file</source> <translation>Erzeuge {0}-Datei</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="917" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="974" /> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1013" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1000" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1070" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1057" /> <source>Do you really want to remove these files from the repository?</source> <translation>Wollen Sie wirklich diese Dateien vom Repository löschen?</translation> </message> @@ -39218,1513 +39413,1518 @@ <context> <name>HgProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="126" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="135" /> <source>New from repository</source> <translation>Neu aus Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="128" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="137" /> <source>&New from repository...</source> <translation>&Neu aus Repository...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="135" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="144" /> <source>Create (clone) a new project from a Mercurial repository</source> <translation>Erzeuge (klone) ein neues Projekt aus einem Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="138" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="147" /> <source><b>New from repository</b><p>This creates (clones) a new local project from a Mercurial repository.</p></source> <translation><b>Neu aus Repository</b><p>Dies erzeugt (clone) ein neues Projekt aus dem Mercurial-Repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="150" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="148" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="159" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="157" /> <source>Show incoming log</source> <translation>Zeige eingehendes Log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="156" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="165" /> <source>Show the log of incoming changes</source> <translation>Zeige das Log eingehender Änderungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="158" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="167" /> <source><b>Show incoming log</b><p>This shows the log of changes coming into the repository.</p></source> <translation><b>Zeige eingehendes Log</b><p>Dies zeigt das Log von Änderungen, die in das Repository gehen.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="170" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="168" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="179" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="177" /> <source>Pull changes</source> <translation>Änderungen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="176" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="185" /> <source>Pull changes from a remote repository</source> <translation>Änderungen von einem entfernten Repository herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="178" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="187" /> <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository.</p></source> <translation><b>Änderungen herunterladen</b><p>Dies lädt Änderungen von einem entfernten Repository in das lokale Repository herunter.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="188" /> - <source>Update from repository</source> - <translation>Abgleich mit Repository</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="190" /> - <source>&Update from repository</source> - <translation>&Abgleich mit Repository</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="197" /> + <source>Update from repository</source> + <translation>Abgleich mit Repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="199" /> + <source>&Update from repository</source> + <translation>&Abgleich mit Repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="206" /> <source>Update the local project from the Mercurial repository</source> <translation>Abgleich des lokalen Projektes mit dem Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="200" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="209" /> <source><b>Update from repository</b><p>This updates the local project from the Mercurial repository.</p></source> <translation><b>Abgleich mit Repository</b><p>Dies gleicht das lokale Projekt mit dem Mercurial-Repository ab.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="210" /> - <source>Commit changes to repository</source> - <translation>Änderungen in Repository einpflegen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="212" /> - <source>&Commit changes to repository...</source> - <translation>&Änderungen in Repository einpflegen...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="219" /> + <source>Commit changes to repository</source> + <translation>Änderungen in Repository einpflegen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="221" /> + <source>&Commit changes to repository...</source> + <translation>&Änderungen in Repository einpflegen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="228" /> <source>Commit changes to the local project to the Mercurial repository</source> <translation>Änderungen am lokalen Projekt in das Mercurial-Repository einpflegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="231" /> <source><b>Commit changes to repository</b><p>This commits changes to the local project to the Mercurial repository.</p></source> <translation><b>Änderungen in Repository einpflegen</b><p>Dies pflegt Änderungen am lokalen Projekt in das Mercurial-Repository ein.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="234" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="232" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="243" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="241" /> <source>Show outgoing log</source> <translation>Zeige ausgehendes Log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="240" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="249" /> <source>Show the log of outgoing changes</source> <translation>Zeige das Log ausgehender Änderungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="242" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251" /> <source><b>Show outgoing log</b><p>This shows the log of changes outgoing out of the repository.</p></source> <translation><b>Zeige ausgehendes Log</b><p>Dies zeigt das Log von Änderungen, die aus dem Repository gehen.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="254" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="252" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261" /> <source>Push changes</source> <translation>Änderungen hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="260" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="269" /> <source>Push changes to a remote repository</source> <translation>Änderungen an ein entferntes Repository hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="262" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271" /> <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> <translation><b>Änderungen hochladen</b><p>Dies lädt Änderungen vom lokalen Repository an ein entferntes Repository hoch.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="274" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="272" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281" /> <source>Push changes (force)</source> <translation>Änderungen hochladen (force)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="290" /> <source>Push changes to a remote repository with force option</source> <translation>Änderungen an ein entferntes Repository mit der Option „force“ hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="284" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293" /> <source><b>Push changes (force)</b><p>This pushes changes from the local repository to a remote repository using the 'force' option.</p></source> <translation><b>Änderungen hochladen (force)</b><p>Dies lädt Änderungen vom lokalen Repository an ein entferntes Repository mit der Option „force“ hoch.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="294" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="303" /> <source>Export from repository</source> <translation>Export aus Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="296" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="305" /> <source>&Export from repository...</source> <translation>&Export aus Repository...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="302" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="311" /> <source>Export a project from the repository</source> <translation>Exportiert ein Projekt aus dem Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="313" /> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation><b>Export aus Repository</b<<p>Dies exportiert ein Projekt aus dem Repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="313" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="324" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322" /> <source>Show log browser</source> <translation>Zeige Log Browser</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="331" /> <source>Show a dialog to browse the log of the local project</source> <translation>Zeigt einen Dialog, um das Log des lokalen Projektes durchzusehen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="334" /> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation><b>Zeige Log Browser</b><p>Dies zeigt einen Dialog, um das Log des lokalen Projektes durchzusehen. Zunächst wird nur eine begrenzte Anzahl an Einträgen angezeigt. Weitere können später geholt werden.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="336" /> - <source>Show differences</source> - <translation>Unterschiede anzeigen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="338" /> - <source>Show &difference</source> - <translation>&Unterschiede anzeigen</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="345" /> + <source>Show differences</source> + <translation>Unterschiede anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347" /> + <source>Show &difference</source> + <translation>&Unterschiede anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="354" /> <source>Show the difference of the local project to the repository</source> <translation>Zeigt den Unterschied des lokalen Projektes zum Repository an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="357" /> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation><b>Unterschiede anzeigen</b><p>Dies zeigt Unterschiede des lokalen Projektes zum Repository an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="360" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="358" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="369" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="367" /> <source>Show differences (extended)</source> <translation>Unterschiede anzeigen (erweitert)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="367" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376" /> <source>Show the difference of revisions of the project to the repository</source> <translation>Zeigt den Unterschied von Revisionen des Projektes an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="370" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379" /> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation><b>Unterschiede anzeigen (erweitert)</b><p>Dies zeigt Unterschiede von Revisionen des Projektes an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="380" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389" /> <source>Show status</source> <translation>Status anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="391" /> <source>Show &status...</source> <translation>Status an&zeigen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="397" /> <source>Show the status of the local project</source> <translation>Zeige den Status des lokalen Projektes an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390" /> - <source><b>Show status</b><p>This shows the status of the local project.</p></source> - <translation><b>Status anzeigen</b><p>Dies zeigt den Status des lokalen Projektes an.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="399" /> - <source>Show Summary</source> - <translation>Übersichtsinformationen anzeigen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="401" /> - <source>Show summary...</source> - <translation>Übersichtsinformationen anzeigen...</translation> + <source><b>Show status</b><p>This shows the status of the local project.</p></source> + <translation><b>Status anzeigen</b><p>Dies zeigt den Status des lokalen Projektes an.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408" /> + <source>Show Summary</source> + <translation>Übersichtsinformationen anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="410" /> + <source>Show summary...</source> + <translation>Übersichtsinformationen anzeigen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="417" /> <source>Show summary information of the working directory status</source> <translation>Zeige Übersichtsinformationen zum Status des Arbeitsverzeichnisses</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="411" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420" /> <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> <translation><b>Übersichtsinformationen anzeigen</b><p>Dies zeigt Übersichtsinformationen zum Status des Arbeitsverzeichnisses.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="430" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="430" /> <source>Show heads</source> <translation>Köpfe anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="432" /> <source>Show the heads of the repository</source> <translation>Zeigt die Köpfe des Repository an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="425" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="434" /> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation><b>Köpfe anzeigen</b><p>Dies zeigt die Köpfe des Repository an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="434" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="443" /> <source>Show parents</source> <translation>Vorgänger anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="441" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450" /> <source>Show the parents of the repository</source> <translation>Zeigt die Vorgänger des repository an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="443" /> - <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> - <translation><b>Vorgänger anzeigen</b><p>Dies zeigt die Vorgänger des repository an.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="452" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="452" /> + <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> + <translation><b>Vorgänger anzeigen</b><p>Dies zeigt die Vorgänger des repository an.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461" /> <source>Show tip</source> <translation>Spitze (tip) anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="463" /> <source>Show the tip of the repository</source> <translation>Zeigt die Spitze (tip) des Repository an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="456" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="465" /> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation><b>Spitze (tip) anzeigen</b><p>Dies zeigt die Spitze (tip) des Repository an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462" /> - <source>Revert changes</source> - <translation>Änderungen rückgängig</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464" /> - <source>Re&vert changes</source> - <translation>Änderungen &rückgängig</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471" /> + <source>Revert changes</source> + <translation>Änderungen rückgängig</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="473" /> + <source>Re&vert changes</source> + <translation>Änderungen &rückgängig</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="480" /> <source>Revert all changes made to the local project</source> <translation>Alle Änderungen am lokalen Projekt werden rückgängig gemacht</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483" /> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation><b>Änderungen rückgängig</b><p>Dies macht alle Änderungen am lokalen Projekt werden rückgängig.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2110" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2129" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492" /> <source>Merge</source> <translation>Änderungen zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="485" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494" /> <source>Mer&ge changes...</source> <translation>Änderungen &zusammenführen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501" /> <source>Merge changes of a revision into the local project</source> <translation>Änderungen einer Revision mit dem lokalen Projekt zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="495" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="504" /> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation><b>Änderungen zusammenführen</b><p>Dies führt Änderungen einer Revision mit dem lokalen Projekt zusammen.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="506" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="515" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514" /> <source>Commit Merge</source> <translation>Zusammengeführte Änderungen einpflegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521" /> <source>Commit all the merged changes.</source> <translation>Alle zusammengeführten Änderungen einpflegen.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="523" /> <source><b>Commit a merge</b><p>This commits a merge working directory</p></source> <translation><b>Zusammengeführte Änderungen einpflegen</b><p>Dies pflegt ein Arbeitsverzeichnis mit zusammengeführten Änderungen ein.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="523" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="533" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="532" /> <source>Abort Merge</source> <translation>Zusammenführung abbrechen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="531" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540" /> <source>Abort an uncommitted merge and lose all changes</source> <translation>Bricht eine nicht eingepflegte Zusammenführung unter Verlust aller Änderungen ab</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="543" /> <source><b>Abort uncommitted merge</b><p>This aborts an uncommitted merge causing all changes to be lost.</p></source> <translation><b>Zusammenführung abbrechen</b><p>Dies bricht eine nicht eingepflegte Zusammenführung unter Verlust aller Änderungen ab.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="546" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="544" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="553" /> <source>Re-Merge</source> <translation>Neu zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="553" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="562" /> <source>Re-Merge all conflicting, unresolved files of the project</source> <translation>Alle Dateien des Projektes mit nicht aufgelösten Konflikten erneut zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="556" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="565" /> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation><b>Neu zusammenführen</b><p>Dies führt alle Dateien des Projektes mit nicht aufgelösten Konflikten unter Verlust sämtlicher vorangegangener Versuche erneut zusammen.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="575" /> <source>Show conflicts</source> <translation>Zeige Konflikte</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="576" /> <source>Show conflicts...</source> <translation>Zeige Konflikte...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="583" /> <source>Show a dialog listing all files with conflicts</source> <translation>Zeige einen Dialog mit allen Dateien mit Konflikten an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586" /> <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> <translation><b>Zeige Konflikte</b><p>Dies zeigt einen Dialog mit allen Dateien, die einen Konflikt hatten oder noch haben.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596" /> <source>Conflicts resolved</source> <translation>Konflikte gelöst</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="597" /> <source>Con&flicts resolved</source> <translation>&Konflikte gelöst</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604" /> <source>Mark all conflicts of the local project as resolved</source> <translation>Markiert alle Konflikte des lokalen Projektes als gelöst</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="607" /> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation><b>Konflikte gelöst</b><p>Dies markiert alle Konflikte des lokalen Projektes als gelöst.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617" /> <source>Conflicts unresolved</source> <translation>Konflikte ungelöst</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625" /> <source>Mark all conflicts of the local project as unresolved</source> <translation>Markiert alle Konflikte des lokalen Projektes als ungelöst</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628" /> <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> <translation><b>Konflikte ungelöst</b><p>Dies markiert alle Konflikte des lokalen Projektes als ungelöst.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638" /> <source>Tag in repository</source> <translation>Im Repository markieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640" /> <source>&Tag in repository...</source> <translation>Im Repository &markieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="637" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646" /> <source>Tag the local project in the repository</source> <translation>Das lokale Projekt im Repository markieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="639" /> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation><b>Im Repository markieren</b><p>Dies markiert das lokale Projekt im Repository.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648" /> - <source>List tags</source> - <translation>Marken listen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="649" /> - <source>List tags...</source> - <translation>Marken listen...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655" /> - <source>List tags of the project</source> - <translation>Listet Marken des Projektes</translation> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation><b>Im Repository markieren</b><p>Dies markiert das lokale Projekt im Repository.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657" /> - <source><b>List tags</b><p>This lists the tags of the project.</p></source> - <translation><b>Marken listen</b><p>Dies listet die Marken des Projektes.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663" /> - <source>List branches</source> - <translation>Zweige listen</translation> + <source>List tags</source> + <translation>Marken listen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="658" /> + <source>List tags...</source> + <translation>Marken listen...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="664" /> - <source>List branches...</source> - <translation>Zweige listen...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670" /> - <source>List branches of the project</source> - <translation>Listet Zweige des Projektes</translation> + <source>List tags of the project</source> + <translation>Listet Marken des Projektes</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666" /> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <translation><b>Marken listen</b><p>Dies listet die Marken des Projektes.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672" /> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation><b>Zweige listen</b><p>Dies listet die Zweige des Projektes.</p></translation> + <source>List branches</source> + <translation>Zweige listen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673" /> + <source>List branches...</source> + <translation>Zweige listen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="679" /> + <source>List branches of the project</source> + <translation>Listet Zweige des Projektes</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681" /> - <source>Create branch</source> - <translation>Zweig erzeugen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="683" /> - <source>Create &branch...</source> - <translation>&Zweig erzeugen...</translation> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation><b>Zweige listen</b><p>Dies listet die Zweige des Projektes.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="690" /> + <source>Create branch</source> + <translation>Zweig erzeugen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692" /> + <source>Create &branch...</source> + <translation>&Zweig erzeugen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699" /> <source>Create a new branch for the local project in the repository</source> <translation>Erzeuge einen neuen Zweig für das lokale Projekt im Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="693" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="702" /> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation><b>Zweig erzeugen</b><p>Dies erzeugt einen neuen Zweig für das lokale Projekt im Repository</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712" /> <source>Push new branch</source> <translation>Neuen Zweig hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721" /> <source>Push the current branch of the local project as a new named branch</source> <translation>Lade den aktuellen Zweig als neuen benannten Zweig hoch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="717" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726" /> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation><b>Neuen Zweig hochladen</b><p>Dies lädt den aktuellen Zweig als neuen benannten Zweig hoch.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="738" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736" /> <source>Close branch</source> <translation>Zweig abschließen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="745" /> <source>Close the current branch of the local project</source> <translation>Schließt den aktuellen Zweig des lokalen Projektes ab</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748" /> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation><b>Zweig abschließen</b><p>Dies schließt den aktuellen Zweig des lokalen Projektes ab.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="758" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757" /> <source>Show current branch</source> <translation>Zeige aktuellen Zweig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="756" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765" /> <source>Show the current branch of the project</source> <translation>Zeigt den aktuellen Zweig des Projektes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="759" /> - <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> - <translation><b>Zeige aktuellen Zweig</b><p>Dies zeigt den aktuellen Zweig des Projektes.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768" /> - <source>Switch</source> - <translation>Umschalten</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770" /> - <source>S&witch...</source> - <translation>Umschal&ten...</translation> + <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> + <translation><b>Zeige aktuellen Zweig</b><p>Dies zeigt den aktuellen Zweig des Projektes.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777" /> + <source>Switch</source> + <translation>Umschalten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="779" /> + <source>S&witch...</source> + <translation>Umschal&ten...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786" /> <source>Switch the working directory to another revision</source> <translation>Schaltet das Arbeitsverzeichnis auf eine andere Revision um</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="780" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="789" /> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation><b>Umschalten</b><p>Dies schaltet das lokale Arbeitsverzeichnis auf eine andere Revision um.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799" /> <source>Cleanup</source> <translation>Aufräumen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799" /> <source>Cleanu&p</source> <translation>Au&fräumen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="792" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801" /> <source>Cleanup the local project</source> <translation>Räume das lokale Projekt auf</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794" /> - <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> - <translation><b>Aufräumen</b><p>Dies räumt das lokale Projekt auf.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="803" /> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation><b>Aufräumen</b><p>Dies räumt das lokale Projekt auf.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="812" /> <source>Execute command</source> <translation>Befehl ausführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813" /> <source>E&xecute command...</source> <translation>Befehl ausf&ühren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="811" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="820" /> <source>Execute an arbitrary Mercurial command</source> <translation>Führe einen beliebigen Mercurial-Befehl aus</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="814" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="823" /> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation><b>Befehl ausführen</b><p>Dies öffnet einen Dialog zur Eingabe eines beliebeigen Mercurial-Befehls.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="824" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833" /> <source>Configure</source> <translation>Einstellungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="834" /> <source>Configure...</source> <translation>Einstellungen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="841" /> <source>Show the configuration dialog with the Mercurial page selected</source> <translation>Zeigt den Konfigurationsdialog mit ausgewählter Mercurial-Seite</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="835" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="844" /> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation><b>Einstellungen</b><p>Zeigt den Konfigurationsdialog mit ausgewählter Mercurial-Seite.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854" /> <source>Edit user configuration</source> <translation>Nutzerkonfiguration editieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855" /> <source>Edit user configuration...</source> <translation>Nutzerkonfiguration editieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="862" /> <source>Show an editor to edit the user configuration file</source> <translation>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Nutzers</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="856" /> - <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> - <translation><b>Nutzerkonfiguration editieren</b><p>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Nutzers.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865" /> + <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> + <translation><b>Nutzerkonfiguration editieren</b><p>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Nutzers.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874" /> <source>Edit repository configuration</source> <translation>Repositorykonfiguration editieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875" /> <source>Edit repository configuration...</source> <translation>Repositorykonfiguration editieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="873" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882" /> <source>Show an editor to edit the repository configuration file</source> <translation>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="876" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885" /> <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation><b>Repositorykonfiguration editieren</b><p>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895" /> <source>Show combined configuration settings</source> <translation>Zeige kombinierte Einstellungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896" /> <source>Show combined configuration settings...</source> <translation>Zeige kombinierte Einstellungen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="894" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903" /> <source>Show the combined configuration settings from all configuration files</source> <translation>Zeigt die kombinierten Einstellungen aus allen Konfigurationsdateien</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909" /> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation><b>Zeige kombinierte Einstellungen</b><p>Dies zeigt die kombinierten Einstellungen aus allen Konfigurationsdateien.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919" /> <source>Show paths</source> <translation>Pfade anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="911" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="920" /> <source>Show paths...</source> <translation>Pfade anzeigen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="918" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="927" /> <source>Show the aliases for remote repositories</source> <translation>Zeigt die Namen für entfernte Repositorys</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="921" /> - <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> - <translation><b>Pfade anzeigen</b><p>Dies zeigt die Namen für entfernte Repositorys.</p<</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930" /> - <source>Verify repository</source> - <translation>Repository verifizieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="931" /> - <source>Verify repository...</source> - <translation>Repository verifizieren...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937" /> - <source>Verify the integrity of the repository</source> - <translation>Verfiziert die Integrität des Repository</translation> + <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> + <translation><b>Pfade anzeigen</b><p>Dies zeigt die Namen für entfernte Repositorys.</p<</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="939" /> - <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> - <translation><b>Repository verifizieren</b><p>Dies verfiziert die Integrität des Repository.</p></translation> + <source>Verify repository</source> + <translation>Repository verifizieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="940" /> + <source>Verify repository...</source> + <translation>Repository verifizieren...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="946" /> + <source>Verify the integrity of the repository</source> + <translation>Verfiziert die Integrität des Repository</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="948" /> + <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> + <translation><b>Repository verifizieren</b><p>Dies verfiziert die Integrität des Repository.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="957" /> <source>Recover</source> <translation>Transaktion zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="948" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="957" /> <source>Recover...</source> <translation>Transaktion zurücksetzen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="951" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960" /> <source>Recover from an interrupted transaction</source> <translation>Setzt eine abgebrochene Transaktion zurück</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="954" /> - <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> - <translation><b>Transaktion zurücksetzen</b><p>Dies setzt eine abgebrochene Transaktion zurück.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="963" /> - <source>Identify</source> - <translation>Identifizieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964" /> - <source>Identify...</source> - <translation>Identifizieren...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="970" /> - <source>Identify the project directory</source> - <translation>Identifiziere das Projektverzeichnis</translation> + <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> + <translation><b>Transaktion zurücksetzen</b><p>Dies setzt eine abgebrochene Transaktion zurück.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="972" /> + <source>Identify</source> + <translation>Identifizieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973" /> + <source>Identify...</source> + <translation>Identifizieren...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979" /> + <source>Identify the project directory</source> + <translation>Identifiziere das Projektverzeichnis</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="981" /> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation><b>Identifizieren</b><p>Dies identifiziert das Projektverzeichnis.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="981" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="990" /> <source>Create .hgignore</source> <translation>Erstelle .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="989" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="998" /> <source>Create a .hgignore file with default values</source> <translation>Erstelle eine .hgignore-Datei mit Standardwerten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="992" /> - <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> - <translation><b>Erstelle .hgignore</b><p>Dies erstellt eine .hgignore-Datei mit Standardwerten.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001" /> - <source>Create changegroup</source> - <translation>Änderungsgruppe erzeugen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1003" /> - <source>Create changegroup...</source> - <translation>Änderungsgruppe erzeugen...</translation> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> + <translation><b>Erstelle .hgignore</b><p>Dies erstellt eine .hgignore-Datei mit Standardwerten.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010" /> + <source>Create changegroup</source> + <translation>Änderungsgruppe erzeugen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1012" /> + <source>Create changegroup...</source> + <translation>Änderungsgruppe erzeugen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1019" /> <source>Create changegroup file collecting changesets</source> <translation>Erzeuge eine Änderungsgruppendatei für Änderungssätze</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1013" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1022" /> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation><b>Änderungsgruppe erzeugen</b><p>Dies erzeuge eine Änderungsgruppendatei für ausgewählte Änderungssätze (hg bundle).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1023" /> - <source>Preview changegroup</source> - <translation>Änderungsgruppe ansehen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1025" /> - <source>Preview changegroup...</source> - <translation>Änderungsgruppe ansehen...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032" /> + <source>Preview changegroup</source> + <translation>Änderungsgruppe ansehen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1034" /> + <source>Preview changegroup...</source> + <translation>Änderungsgruppe ansehen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041" /> <source>Preview a changegroup file containing a collection of changesets</source> <translation>Eine Änderungsgruppendatei für Änderungssätze ansehen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044" /> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation><b>Änderungsgruppe ansehen</b><p>Dies zeigt den Inhalt einer Änderungsgruppendatei für Änderungssätze an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2244" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1045" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2263" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054" /> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1047" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056" /> <source>Apply changegroups...</source> <translation>Änderungsgruppen anwenden...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063" /> <source>Apply one or several changegroup files</source> <translation>Wende eine oder mehrere Änderungsgruppendateien an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066" /> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation><b>Änderungsgruppen anwenden</b><p>Dies wendet eine oder mehrere mit „Änderungsgruppe erzeugen“ erstellte Änderungsgruppendateien an (hg unbundle).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1067" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076" /> <source>Mark as "good"</source> <translation>Als „gut“ markieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1077" /> <source>Mark as "good"...</source> <translation>Als „gut“ markieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1075" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1084" /> <source>Mark a selectable changeset as good</source> <translation>Markiere einen auswählbaren Änderungssatz als gut</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1078" /> - <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> - <translation><b>Als gut markieren</b><p>Dies markiert einen auswählbaren Änderungssatz als gut.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1087" /> - <source>Mark as "bad"</source> - <translation>Als „schlecht“ markieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088" /> - <source>Mark as "bad"...</source> - <translation>Als „schlecht“ markieren...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1094" /> - <source>Mark a selectable changeset as bad</source> - <translation>Markiere einen auswählbaren Änderungssatz als schlecht</translation> + <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> + <translation><b>Als gut markieren</b><p>Dies markiert einen auswählbaren Änderungssatz als gut.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1096" /> - <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> - <translation><b>Als schlecht markieren</b><p>Dies markiert einen auswählbaren Änderungssatz als schlecht.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105" /> - <source>Skip</source> - <translation>Überspringen</translation> + <source>Mark as "bad"</source> + <translation>Als „schlecht“ markieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1097" /> + <source>Mark as "bad"...</source> + <translation>Als „schlecht“ markieren...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103" /> + <source>Mark a selectable changeset as bad</source> + <translation>Markiere einen auswählbaren Änderungssatz als schlecht</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105" /> + <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> + <translation><b>Als schlecht markieren</b><p>Dies markiert einen auswählbaren Änderungssatz als schlecht.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1114" /> + <source>Skip</source> + <translation>Überspringen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1114" /> <source>Skip...</source> <translation>Überspringen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1107" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116" /> <source>Skip a selectable changeset</source> <translation>Überspringe einen auswählbaren Änderungssatz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1109" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118" /> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation><b>Überspringen</b><p>Dies überspringt einen auswählbaren Änderungssatz.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1115" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1115" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124" /> <source>Reset</source> <translation>Zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1117" /> - <source>Reset the bisect search data</source> - <translation>Setzt die Bisect Suchdaten zurück</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119" /> - <source><b>Reset</b><p>This resets the bisect search data.</p></source> - <translation><b>Zurücksetzen</b><p>Dies setzt die Bisect Suchdaten zurück.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1126" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1125" /> + <source>Reset the bisect search data</source> + <translation>Setzt die Bisect Suchdaten zurück</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128" /> + <source><b>Reset</b><p>This resets the bisect search data.</p></source> + <translation><b>Zurücksetzen</b><p>Dies setzt die Bisect Suchdaten zurück.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1135" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134" /> <source>Back out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1142" /> <source>Back out changes of an earlier changeset</source> <translation>Änderungen eines früheren Änderungssatzes umkehren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1145" /> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation><b>Änderungssatz umkehren</b><p>Dies kehrt die Änderungen eines früheren Änderungssatzes um.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1145" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1155" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154" /> <source>Rollback last transaction</source> <translation>Letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1152" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161" /> <source>Rollback the last transaction</source> <translation>Die letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1163" /> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation><b>Letzte Transaktion zurücksetzen</b><p>Dies setzt die letzte Transaktion zurück. Transaktionen werden verwendet, um die Effekte aller Befehle, die neue Änderungssätze erzeugen oder vorhandene Änderungssätze in das Repository propagieren, zu kapseln. So arbeiten z.B. die folgenden Befehle transaktional und ihre Effekte können zurückgesetzt werden:<ul><li>commit</li><li>import</li><li>pull</li><li>push (mit diesem repository als Ziel)</li><li>unbundle</li></ul></p><p><strong>Dieser Befehl kann gefährlich sein. Bitte mit Vorsicht verwenden.</strong></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1176" /> - <source>Serve project repository</source> - <translation>Server für Projektrepository</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1177" /> - <source>Serve project repository...</source> - <translation>Server für Projektrepository...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183" /> - <source>Serve the project repository</source> - <translation>Server für das Projektrepository bereitstellen</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185" /> + <source>Serve project repository</source> + <translation>Server für Projektrepository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1186" /> + <source>Serve project repository...</source> + <translation>Server für Projektrepository...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1192" /> + <source>Serve the project repository</source> + <translation>Server für das Projektrepository bereitstellen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1194" /> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation><b>Server für Projektrepository<b><p>Dies stellt einen Server für das Projektrepository zur Verfügung.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2301" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1194" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1203" /> <source>Import Patch</source> <translation>Patch importieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1196" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1205" /> <source>Import Patch...</source> <translation>Patch importieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1202" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211" /> <source>Import a patch from a patch file</source> <translation>Einen Patch aus einer Patchdatei importieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1204" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1213" /> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation><b>Patch importieren</b><p>Dies importiert einen Patch aus einer Patchdatei in das Projekt.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1214" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1223" /> <source>Export Patches</source> <translation>Patches exportieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1225" /> <source>Export Patches...</source> <translation>Patches exportieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1222" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1231" /> <source>Export revisions to patch files</source> <translation>Änderungssätze in Patchdateien exportieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1224" /> - <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> - <translation><b>Patches exportieren</b><p>Dies exportiert Änderungssätze des projektes in Patchdateien.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233" /> - <source>Change Phase</source> - <translation>Phase ändern</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234" /> - <source>Change Phase...</source> - <translation>Phase ändern...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1240" /> - <source>Change the phase of revisions</source> - <translation>Ändert die Phase von Revisionen</translation> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> + <translation><b>Patches exportieren</b><p>Dies exportiert Änderungssätze des projektes in Patchdateien.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1242" /> + <source>Change Phase</source> + <translation>Phase ändern</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1243" /> + <source>Change Phase...</source> + <translation>Phase ändern...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1249" /> + <source>Change the phase of revisions</source> + <translation>Ändert die Phase von Revisionen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251" /> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation><b>Phase ändern</b><p>Dies ändert die Phase von Revisionen.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2343" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1804" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1253" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2362" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1822" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1262" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1260" /> <source>Copy Changesets</source> <translation>Änderungssätze kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1259" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1268" /> <source>Copies changesets from another branch</source> <translation>Änderungssätze aus einem anderen Zweig kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1261" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270" /> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation><b>Änderungssätze kopieren</b><p>Dies kopiert Änderungssätze aus einem anderen Zweig mit dem Nutzernamen, der Datums und der Änderungsmeldung des Originaländerungssatzes in das Arbeitsverzeichnis.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1273" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1272" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1282" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1281" /> <source>Continue Copying Session</source> <translation>Kopiersitzung fortsetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1280" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1289" /> <source>Continue the last copying session after conflicts were resolved</source> <translation>Setzt die letzte Kopiersitzung nach Lösung von Konflikten fort</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1283" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1292" /> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation><b>Kopiersitzung fortsetzen</b><p>Dies setzt die letzte Kopiersitzung nach Lösung von Konflikten fort.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1294" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1293" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1303" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1302" /> <source>Stop Copying Session</source> <translation>Kopiersitzung anhalten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1310" /> <source>Stop the interrupted copying session</source> <translation>Hält die unterbrochene Kopiersitzung an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1304" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1313" /> <source><b>Stop Copying Session</b><p>This stops the interrupted copying session.</p></source> <translation><b>Kopiersitzung anhalten</b><p>Dies hält die unterbrochene Kopiersitzung an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1314" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1313" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1323" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1322" /> <source>Abort Copying Session</source> <translation>Kopiersitzung abbrechen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1321" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330" /> <source>Abort the interrupted copying session and rollback</source> <translation>Bricht die unterbrochene Kopiersitzung ab und rollt sie zurück</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1324" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1333" /> <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> <translation><b>Kopiersitzung abbrechen</b><p>Dies bricht die unterbrochene Kopiersitzung ab und rollt sie auf den Zustand vor dem Kopieren zurück.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1334" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1343" /> <source>Add</source> <translation>Hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1336" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1345" /> <source>Add...</source> <translation>Hinzufügen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1342" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1351" /> <source>Add a sub-repository</source> <translation>Ein Unterrepository hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1344" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1353" /> <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation><b>Hinzufügen...</b><p>Ein Unterrepository zum Projekt hinzufügen.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1350" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1359" /> <source>Remove</source> <translation>Entfernen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1352" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1361" /> <source>Remove...</source> <translation>Entfernen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1358" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367" /> <source>Remove sub-repositories</source> <translation>Unterrepositorys löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1360" /> - <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> - <translation><b>Entfernen...</b><p>Unterrepositorys aus dem Projekt löschen.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1369" /> - <source>Create unversioned archive</source> - <translation>Erzeuge nicht versioniertes Archiv</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1371" /> - <source>Create unversioned archive...</source> - <translation>Erzeuge nicht versioniertes Archiv...</translation> + <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> + <translation><b>Entfernen...</b><p>Unterrepositorys aus dem Projekt löschen.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1378" /> + <source>Create unversioned archive</source> + <translation>Erzeuge nicht versioniertes Archiv</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1380" /> + <source>Create unversioned archive...</source> + <translation>Erzeuge nicht versioniertes Archiv...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1387" /> <source>Create an unversioned archive from the repository</source> <translation>Erzeuge ein unversioniertes Archive des Repositories</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1381" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1390" /> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation><b>Erzeuge nicht versioniertes Archiv...</b><p>Dies erzeugt ein unversioniertes Archive des Repositories.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1391" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1400" /> <source>List bookmarks</source> <translation>Lesezeichen listen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1393" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1402" /> <source>List bookmarks...</source> <translation>Lesezeichen listen …</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1399" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1408" /> <source>List bookmarks of the project</source> <translation>Listet Lesezeichen des Projektes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1401" /> - <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> - <translation><b>Lesezeichen listen</b><p>Dies listet die Lesezeichen des Projektes.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1410" /> - <source>Define bookmark</source> - <translation>Lesezeichen hinzufügen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1412" /> - <source>Define bookmark...</source> - <translation>Lesezeichen hinzufügen …</translation> + <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> + <translation><b>Lesezeichen listen</b><p>Dies listet die Lesezeichen des Projektes.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1419" /> + <source>Define bookmark</source> + <translation>Lesezeichen hinzufügen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1421" /> + <source>Define bookmark...</source> + <translation>Lesezeichen hinzufügen …</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1428" /> <source>Define a bookmark for the project</source> <translation>Fügt dem Projekt ein Lesezeichen hinzu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1422" /> - <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> - <translation><b>Lesezeichen hinzufügen</b><p>Dies fügt dem Projekt ein Lesezeichen hinzu.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1431" /> - <source>Delete bookmark</source> - <translation>Lesezeichen löschen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1433" /> - <source>Delete bookmark...</source> - <translation>Lesezeichen löschen …</translation> + <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> + <translation><b>Lesezeichen hinzufügen</b><p>Dies fügt dem Projekt ein Lesezeichen hinzu.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1440" /> + <source>Delete bookmark</source> + <translation>Lesezeichen löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1442" /> + <source>Delete bookmark...</source> + <translation>Lesezeichen löschen …</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1449" /> <source>Delete a bookmark of the project</source> <translation>Löscht ein Lesezeichen aus dem Projekt</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1443" /> - <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> - <translation><b>Lesezeichen löschen</b><p>Dies löscht ein Lesezeichen aus dem Projekt.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1452" /> - <source>Rename bookmark</source> - <translation>Lesezeichen umbenennen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1454" /> - <source>Rename bookmark...</source> - <translation>Lesezeichen umbenennen …</translation> + <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> + <translation><b>Lesezeichen löschen</b><p>Dies löscht ein Lesezeichen aus dem Projekt.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1461" /> + <source>Rename bookmark</source> + <translation>Lesezeichen umbenennen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1463" /> + <source>Rename bookmark...</source> + <translation>Lesezeichen umbenennen …</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1470" /> <source>Rename a bookmark of the project</source> <translation>Benennt ein Lesezeichen des Projektes um</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1464" /> - <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> - <translation><b>Lesezeichen umbenennen</b><p>Dies benennt ein Lesezeichen des Projektes um</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1473" /> + <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> + <translation><b>Lesezeichen umbenennen</b><p>Dies benennt ein Lesezeichen des Projektes um</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1482" /> <source>Move bookmark</source> <translation>Lesezeichen verschieben</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1475" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1484" /> <source>Move bookmark...</source> <translation>Lesezeichen verschieben …</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1481" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1490" /> <source>Move a bookmark of the project</source> <translation>Verschiebt ein Lesezeichen des Projektes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1483" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1492" /> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation><b>Lesezeichen verschieben</b><p>Dies verschiebt ein Lesezeichen des Projektes.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1495" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1493" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1504" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1502" /> <source>Show incoming bookmarks</source> <translation>Zeige eingehende Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1502" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1511" /> <source>Show a list of incoming bookmarks</source> <translation>Zeigt eine Liste eingehender Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1505" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1514" /> <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> <translation><b>Zeige eingehende Lesezeichen</b><p>Dies zeigt eine Liste neuer Lesezeichen, die in einem entfernten Repository verfügbar sind, an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1517" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1515" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1526" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1524" /> <source>Pull bookmark</source> <translation>Lesezeichen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1524" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1533" /> <source>Pull a bookmark from a remote repository</source> <translation>Ein Lesezeichen von einem entfernten Repository herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1527" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1536" /> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation><b>Lesezeichen herunterladen</b><p>Dies lädt ein Lesezeichen von einem entfernten Repository in das lokale Repository herunter.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1539" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1537" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1548" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1546" /> <source>Pull current bookmark</source> <translation>Aktuelles Lesezeichen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1546" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1555" /> <source>Pull the current bookmark from a remote repository</source> <translation>Das aktuelle Lesezeichen von einem entfernten Repository herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1549" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1558" /> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation><b>Aktuelles Lesezeichen herunterladen</b><p>Dies lädt das aktuelle Lesezeichen von einem entfernten Repository in das lokale Repository herunter.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1560" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1558" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1569" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1567" /> <source>Show outgoing bookmarks</source> <translation>Zeige ausgehende Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1567" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1576" /> <source>Show a list of outgoing bookmarks</source> <translation>Zeigt eine Liste ausgehender Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1570" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1579" /> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation><b>Zeige ausgehende Lesezeichen</b><p>Dies zeigt eine Liste neuer Lesezeichen, die im lokalen Repository verfügbar sind, an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1582" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1580" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1591" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1589" /> <source>Push bookmark</source> <translation>Lesezeichen hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1589" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1598" /> <source>Push a bookmark to a remote repository</source> <translation>Ein Lesezeichen an ein entferntes Repository hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1592" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1601" /> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation><b>Lesezeichen hochladen</b><p>Dies lädt ein Lesezeichen vom lokalen Repository an ein entferntes Repository hoch.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1604" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1602" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1613" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1611" /> <source>Push current bookmark</source> <translation>Aktuelles Lesezeichen hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1611" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1620" /> <source>Push the current bookmark to a remote repository</source> <translation>Das aktuelle Lesezeichen an ein entferntes Repository hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1614" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1623" /> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation><b>Aktuelles Lesezeichen hochladen</b><p>Dies lädt das aktuelle Lesezeichen vom lokalen Repository an ein entferntes Repository hoch.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1626" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1624" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1635" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1633" /> <source>Push all bookmarks</source> <translation>Alle Lesezeichen hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1633" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1642" /> <source>Push all bookmarks to a remote repository</source> <translation>Alle Lesezeichen an ein entferntes Repository hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1636" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1645" /> <source><b>Push all bookmarks</b><p>This pushes all bookmark from the local repository to a remote repository.</p></source> <translation><b>Alle Lesezeichen hochladen</b><p>Dies lädt alle Lesezeichen vom lokalen Repository an ein entferntes Repository hoch.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1647" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1645" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1656" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1654" /> <source>Delete all backups</source> <translation>Alle Backups löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1654" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1663" /> <source>Delete all backup bundles stored in the backup area</source> <translation>Löscht alle Backupdateien im Backupbereich</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1657" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1666" /> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation><b>Alle Backups löschen</b><p>Dies löscht alle Backupdateien im Backupbereich des Repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1699" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1708" /> <source>Administration</source> <translation>Verwaltung</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1724" /> - <source>Specials</source> - <translation>Spezialfunktionen</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1733" /> + <source>Specials</source> + <translation>Spezialfunktionen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1742" /> <source>Changegroup Management</source> <translation>Verwaltung von Änderungsgruppen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1740" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1749" /> <source>Patch Management</source> <translation>Verwaltung von Patches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1746" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1755" /> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1754" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1763" /> <source>Tags</source> <translation>Marken</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1761" /> - <source>Branches</source> - <translation>Zweige</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1770" /> + <source>Branches</source> + <translation>Zweige</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1779" /> <source>Bookmarks</source> <translation>Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1791" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1800" /> + <source>Other Functions</source> + <translation>Weitere Funktionen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1809" /> <source>Extensions</source> <translation>Erweiterungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1813" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1831" /> <source>Sub-Repository</source> <translation>Unterrepository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1818" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1836" /> <source>Merge Changesets</source> <translation>Änderungen zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1903" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1901" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1922" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1920" /> <source>Mercurial</source> <translation>Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2054" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2073" /> <source>Pull</source> <translation>Pull</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2391" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2375" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2360" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2344" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2323" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2302" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2245" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2055" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2410" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2394" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2379" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2363" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2342" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2321" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2264" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2074" /> <source>The project should be reread. Do this now?</source> <translation>Das Projekt sollte neu gelesen werde. Jetzt durchführen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2322" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2341" /> <source>Revert Changes</source> <translation>Änderungen rückgängig machen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2359" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2378" /> <source>Copy Changesets (Continue)</source> <translation>Änderungssätze kopieren (Fortsetzung)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2374" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2393" /> <source>Copy Changesets (Stop)</source> <translation>Änderungssätze kopieren (Stopp)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2390" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2409" /> <source>Copy Changesets (Abort)</source> <translation>Änderungssätze kopieren (Abbruch)</translation> </message> @@ -40732,7 +40932,7 @@ <context> <name>HgPurgeListDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/HgPurgeListDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/HgPurgeListDialog.ui" line="0" /> <source>Purge List</source> <translation>Liste zu löschender Dateien und Verzeichnisse</translation> </message> @@ -41904,87 +42104,87 @@ <context> <name>HgShelveBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Mercurial Shelve Browser</source> <translation>Mercurial Ablagen Browser</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Name</source> <translation>Name</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Age</source> <translation>Alter</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Message</source> <translation>Nachricht</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Statistics</source> <translation>Statistiken</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>File</source> <translation>Datei</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Changes</source> <translation>Änderungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Lines added</source> <translation>Zeilen eingefügt</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Lines deleted</source> <translation>Zeilen gelöscht</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Errors</source> <translation>Fehler</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source><b>Mercurial shelve errors</b><p>This shows possible error messages of the hg shelve command.</p></source> <translation><b>Mercurial Ablage Fehler</b><p>Dies zeigt mögliche Fehler des hg shelve Kommandos an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="58" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="58" /> <source>&Refresh</source> <translation>&Erneuern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="60" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="60" /> <source>Press to refresh the list of shelves</source> <translation>Drücken, um die Liste der Ablagen zu erneuern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="69" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="69" /> <source>Restore selected shelve</source> <translation>Ausgewählte Ablage wiederherstellen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="72" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="72" /> <source>Delete selected shelves</source> <translation>Ausgewählte Ablagen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="75" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="75" /> <source>Delete all shelves</source> <translation>Alle Ablagen löschen</translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="290" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="290" /> <source>%n file(s) changed</source> <translation> <numerusform>%n Datei geändert</numerusform> @@ -41992,7 +42192,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="292" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="292" /> <source>%n line(s) inserted</source> <translation> <numerusform>%n Zeile eingefügt</numerusform> @@ -42000,7 +42200,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="295" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="295" /> <source>%n line(s) deleted</source> <translation> <numerusform>%n Zeile gelöscht</numerusform> @@ -42011,57 +42211,57 @@ <context> <name>HgShelveDataDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Shelve</source> <translation>Ablage</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Name:</source> <translation>Name:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Enter a name for the shelve</source> <translation>Gib einen Namen für die Ablage ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Date, Time:</source> <translation>Datum, Zeit:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Enter the commit date and time for the shelve</source> <translation>Gibt Registrierungsdatum und -zeit für die Ablage ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>yyyy-MM-dd HH:mm</source> <translation>dd.MM.yyyy HH:mm</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Message:</source> <translation>Nachricht:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Enter a message for the shelve</source> <translation>Gib eine Nachricht für die Ablage ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Mark new/missing files as added/removed</source> <translation>Neue/fehlende Dateien als hinzugefügt/entfernt markieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Select to shelve, but keep the changes in the working directory</source> <translation>Auswählen zur Ablage unter Beibehaltung der Änderungen im Arbeitsverzeichnis</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Shelve, but keep changes</source> <translation>Ablagen, aber Änderungen beibehalten</translation> </message> @@ -42069,7 +42269,7 @@ <context> <name>HgShelvesSelectionDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelvesSelectionDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelvesSelectionDialog.ui" line="0" /> <source>Mercurial Shelve Selection</source> <translation>Mercurial Ablageauswahl</translation> </message> @@ -42371,129 +42571,6 @@ </message> </context> <context> - <name>HgStripDialog</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Strip Changesets</source> - <translation>Änderungssätze löschen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>&Revision</source> - <translation>&Revision</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to specify a revision by number</source> - <translation>Auswählen, um eine Revision per Nummer zu wählen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Number</source> - <translation>Nummer</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enter a revision number</source> - <translation>Gib eine Revisionsnummer ein</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to specify a revision by changeset id</source> - <translation>Auswählen, um eine Revision mit ihrer Änderungssatz-ID anzugeben</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Id:</source> - <translation>Id:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enter a changeset id</source> - <translation>Gib die Änderungssatz ID ein</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to specify a revision by a tag</source> - <translation>Auswählen, um eine Revision per Marke zu wählen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Tag:</source> - <translation>Marke:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enter a tag name</source> - <translation>Gib den Namen der Marke ein</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to specify a revision by a branch</source> - <translation>Auswählen, um eine Revision per Zweig zu wählen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Branch:</source> - <translation>Zweig:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enter a branch name</source> - <translation>Gib einen Zweignamen ein</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Expression:</source> - <translation>Ausdruck:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enter a revision set expression</source> - <translation>Gib einen Ausdruck für einen Revisionssatz ein</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Bookmark:</source> - <translation>Lesezeichen:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enter a bookmark name</source> - <translation>Gib einen Lesezeichennamen ein</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to enforce removal of changesets</source> - <translation>Auswählen, um das Löschen von Änderungssätzen zu erzwingen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enforce Operation</source> - <translation>Ausführung erzwingen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to not create backup bundles</source> - <translation>Auswählen, um keine Backups anzulegen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>No Backup</source> - <translation>Kein Backup</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to keep the current working directory state</source> - <translation>Auswählen, um den Zustand des Arbeitsverzeichnisses zu erhalten</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Keep Working Directory</source> - <translation>Arbeitsverzeichnisses erhalten</translation> - </message> - </context> - <context> <name>HgSummaryDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.ui" line="0" /> @@ -42999,29 +43076,119 @@ </message> </context> <context> + <name>HgUncommitDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Undo Local Commit</source> + <translation>Lokales Commit rückgängig machen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Commit Message</source> + <translation>Änderungsbeschreibung</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Enter the log message.</source> + <translation>Die Änderungsbeschreibung eingeben.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source><b>Log Message</b> +<p>Enter the log message for the uncommit action.</p></source> + <translation><b>Änderungsbeschreibung</b> +<p>Gib die Änderungsbeschreibung für diese Aktion ein.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Recent commit messages</source> + <translation>Letzte Änderungsbeschreibungen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Select a recent commit message to use</source> + <translation>Wähle eine zu verwendende Änderungsbeschreibung</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Select to allow an empty commit after undoing it.</source> + <translation>Auswählen, um eine leere Änderung nach der Aktion zu belassen.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Allow empty commit after undoing commit</source> + <translation>Leer Änderung nach Aktion belassen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Select to allow undoing the commit with outstanding changes.</source> + <translation>Auswählen, um die Aktion auch bei vorhandenen Änderungen durchzuführen.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Allow undoing commit with outstanding changes</source> + <translation>Aktion auch bei vorhandenen Änderung durchführen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Author</source> + <translation>Autor</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Enter author name to override the configured user:</source> + <translation>Gib den Autorennamen ein, um den konfigurierten Nutzer zu überschreiben:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Enter an author name in order to override the configured one</source> + <translation>Gib einen Autorennamen ein, um den konfigurierten Nutzer zu überschreiben</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Select to give date and time information</source> + <translation>Auswählen, um Datums- und Zeitinformationen einzugeben</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Date and Time</source> + <translation>Datum und Zeit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Date/Time:</source> + <translation>Datum/Zeit:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Enter the date and time to be used</source> + <translation>Gib das zu verwendenden Datum und Zeit ein</translation> + </message> + </context> + <context> <name>HgUnshelveDataDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Mercurial Unshelve</source> <translation>Mercurial Ablagewiederherstellung</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Name:</source> <translation>Name:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Enter the name of the shelve</source> <translation>Gib den Namen der Ablage ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Select to keep the shelved change</source> <translation>Auswählen, um die gewählte Ablage zu behalten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Keep shelved change</source> <translation>Ablage behalten</translation> </message> @@ -43091,23 +43258,23 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the GPG extension</source> - <translation>Auswählen, um die GPG Erweiterung zu aktivieren</translation> + <source>Select to activate the rebase extension</source> + <translation>Auswählen, um die Umgruppieren Erweiterung zu aktivieren</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>GPG</source> - <translation>GPG</translation> + <source>Rebase</source> + <translation>Umgruppieren</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the histedit extension</source> - <translation>Auswählen, um die Histedit Erweiterung zu aktivieren</translation> + <source>Select to activate the queues extension</source> + <translation>Auswählen, um die Patchschlangen Erweiterung zu aktivieren</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Histedit</source> - <translation>Histedit</translation> + <source>Queues</source> + <translation>Patchschlangen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> @@ -43122,53 +43289,43 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the Purge extension</source> - <translation>Auswählen, um die Purge Erweiterung zu aktivieren</translation> + <source>Select to activate the histedit extension</source> + <translation>Auswählen, um die Histedit Erweiterung zu aktivieren</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Purge</source> - <translation>Purge</translation> + <source>Histedit</source> + <translation>Histedit</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the queues extension</source> - <translation>Auswählen, um die Patchschlangen Erweiterung zu aktivieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Queues</source> - <translation>Patchschlangen</translation> + <source>Select to activate the GPG extension</source> + <translation>Auswählen, um die GPG Erweiterung zu aktivieren</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the rebase extension</source> - <translation>Auswählen, um die Umgruppieren Erweiterung zu aktivieren</translation> + <source>GPG</source> + <translation>GPG</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Rebase</source> - <translation>Umgruppieren</translation> + <source>Select to activate the fastexport extension</source> + <translation>Auswählen, um die Fastexport Erweiterung zu aktivieren</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the shelve extension</source> - <translation>Auswählen, um die Ablage (Shelve) Erweiterung zu aktivieren</translation> + <source>Fastexport</source> + <translation>Fastexport</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Shelve</source> - <translation>Ablage</translation> + <source>Select to activate the uncommit extension</source> + <translation>Auswählen, um die Uncommit Erweiterung zu aktivieren</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the strip extension</source> - <translation>Auswählen, um die Strip Erweiterung zu aktivieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Strip</source> - <translation>Strip</translation> + <source>Uncommit</source> + <translation>Uncommit</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> @@ -43387,32 +43544,32 @@ <translation>Standard</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="527" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="474" /> <source>Delete Host Fingerprint</source> <translation>Fingerabdruck löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="528" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="475" /> <source><p>Shall the fingerprint for host <b>{0}</b> really be deleted?</p></source> <translation><p>Soll der Fingerabdruck für den Host <b>{0}</b> wirklich gelöscht werden?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="644" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="591" /> <source>Delete Host Minimum Protocol</source> <translation>Eintrag für ein minimales Protokoll löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="645" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="592" /> <source><p>Shall the minimum protocol entry for host <b>{0}</b> really be deleted?</p></source> <translation><p>Solle der Eintrag für ein minimales Protokoll des Host <b>{0}</b> wirklich gelöscht werden?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="708" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="655" /> <source>Edit User Configuration</source> <translation>Nutzerkonfiguration editieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="709" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="656" /> <source>You will loose all changes made in this dialog. Shall the data be saved first?</source> <translation>Sie werden alle Änderungen, die in diesem Dialog vorgenommen wurden, verlieren. Sollen die Daten vorher gesichert werden?</translation> </message> @@ -43491,17 +43648,17 @@ <context> <name>HgUtilities</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="130" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="132" /> <source>The hg process finished with the exit code {0}</source> <translation>Der hg-Prozess endete mit dem Code {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="134" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="136" /> <source>The hg process did not finish within 30s.</source> <translation>Der hg-Prozess endete nicht innerhalb von 30s.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="138" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="140" /> <source>Could not start the hg executable.</source> <translation>Das hg Programm konnte nicht gestartet werden.</translation> </message> @@ -50818,13 +50975,13 @@ <name>Lexers</name> <message> <location filename="../QScintilla/Lexers/__init__.py" line="412" /> - <location filename="../Preferences/__init__.py" line="599" /> + <location filename="../Preferences/__init__.py" line="598" /> <source>Python Files (*.py *.py3)</source> <translation>Python-Dateien (*.py *.py3)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="505" /> - <location filename="../Preferences/__init__.py" line="602" /> + <location filename="../Preferences/__init__.py" line="601" /> <source>Python3 Files (*.py)</source> <translation>Python 3-Dateien (*.py)</translation> </message> @@ -52666,8 +52823,8 @@ <translation>RP2040/RP2350 basiert</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>Unbekanntes Gerät</translation> </message> @@ -54032,7 +54189,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>{0} (0x{1:04x}/0x{2:04x})</translation> </message> <message> @@ -60246,75 +60403,13 @@ </message> <message> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to install the selected package</source> - <translation>Drücken, um die ausgewählten Pakete zu installieren</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to install the selected package to the user site</source> - <translation>Drücken, um die ausgewählten Pakete in das Python Nutzerverzeichnis zu installieren</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to show details for the selected entry</source> - <translation>Drücken, um Details für den ausgewählten Eintrag anzuzeigen</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Toggle to show or hide the search window</source> - <translation>Umschalten, um das Suchfenster anzuzeigen bzw. zu verstecken</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Package</source> - <translation>Paket</translation> + <source>Press to refresh the lists</source> + <translation>Drücken, um die Listen zu erneuern</translation> </message> <message> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Enter the search term for the package name</source> - <translation>Gib den Suchtext für Paketnamen ein</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Enter search term</source> - <translation>Gib den Suchtext ein</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to start the search</source> - <translation>Drücken, um die Suche zu starten</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to search for more packages</source> - <translation>Drücken, um mehr Pakete zu suchen</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Version</source> - <translation>Version</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Released</source> - <translation>Veröffentlicht</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Description</source> - <translation>Beschreibung</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to refresh the lists</source> - <translation>Drücken, um die Listen zu erneuern</translation> + <source>Press to install a package.</source> + <translation>Drücken, um ein Paket zu installieren.</translation> </message> <message> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> @@ -60333,6 +60428,17 @@ </message> <message> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Press to show details for the selected entry</source> + <translation>Drücken, um Details für den ausgewählten Eintrag anzuzeigen</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Press to remove leftovers of an upgrade or uninstall run.</source> + <translation>Drücken, um Reste eines Upgrade- oder Deinstallationslaufs zu entfernen.</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> <source>Select to show only locally-installed packages</source> <translation>Auswählen, um nur lokal installierte Pakete anzuzeigen</translation> </message> @@ -60376,6 +60482,13 @@ <message> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Package</source> + <translation>Paket</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> <source>Installed</source> <translation>Installiert</translation> </message> @@ -60470,316 +60583,315 @@ <translation>Erfordert</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="199" /> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Search Package:</source> + <translation>Paketsuche:</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Enter package name to search for.</source> + <translation>Gib den zu suchenden Paketnamen ein.</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Press to open a web browser for searching.</source> + <translation>Drücken, um einen Webbrowser zur Suche zu öffnen.</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="83" /> <source>pip Menu</source> <translation>pip Menü</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="233" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="113" /> <source>Author:</source> <translation>Autor:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="234" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="114" /> <source>Author Email:</source> <translation>Autor Email:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="235" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="115" /> <source>Classifiers:</source> <translation>Klassifizierungen:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="236" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="116" /> <source>Entry Points:</source> <translation>Einsprungpunkte:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="237" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="117" /> <source>Files:</source> <translation>Dateien:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="238" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="118" /> <source>Homepage:</source> <translation>Homepage:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="239" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="119" /> <source>Installer:</source> <translation>Installer:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="240" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="120" /> <source>License:</source> <translation>Lizenz:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="241" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="121" /> <source>Location:</source> <translation>Speicherort:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="242" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="122" /> <source>Metadata Version:</source> <translation>Metadaten Version:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="243" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="123" /> <source>Name:</source> <translation>Name:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="244" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="124" /> <source>Project URLs:</source> <translation>Projekt URLs:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="245" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="125" /> <source>Requires:</source> <translation>Erfordert:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="246" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="126" /> <source>Required By:</source> <translation>Erfordert Von:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="247" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="127" /> <source>Summary:</source> <translation>Kurzbeschreibung:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="248" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="128" /> <source>Version:</source> <translation>Version:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="450" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="335" /> <source>Getting installed packages...</source> <translation>Ermittle installierte Pakete...</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="478" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="363" /> <source>Getting outdated packages...</source> <translation>Ermittle veraltete Pakete...</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1231" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1051" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1038" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1002" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="735" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="729" /> + <source>Cleanup Environment</source> + <translation>Environment bereinigen</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="730" /> + <source>The environment cleanup was successful.</source> + <translation>Die Bereinigung des Environments war erfolgreich.</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="736" /> + <source>Some leftover package directories could not been removed. Delete them manually.</source> + <translation>Einige übrig gebliebene Paketverzeichnisse konnten nicht entfernt werden. Lösche diese manuell.</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="834" /> <source>Search PyPI</source> <translation>PyPI durchsuchen</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1003" /> - <source><p>Received an error while searching for <b>{0}</b>.</p><p>Error: {1}</p></source> - <translation><p>Fehler während der Suche nach <b>{0}</b> empfangen.</p><p>Fehler: {1}</p></translation> - </message> - <message numerus="yes"> - <location filename="../PipInterface/PipPackagesWidget.py" line="1018" /> - <source>%n package(s) found.</source> - <translation> - <numerusform>%n Paket gefunden.</numerusform> - <numerusform>%n Pakete gefunden.</numerusform> - </translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1025" /> - <source>Showing first {0} packages found.</source> - <translation>Zeige die ersten {0} gefundenen Pakete.</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1044" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1039" /> - <source><p>There were no results for <b>{0}</b>.</p></source> - <translation><p>Es gab keine Ergebnisse für <b>{0}</b>.</p></translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1052" /> - <source><p>There were no more results for <b>{0}</b>.</p></source> - <translation><p>Es gab keine weiteren Ergebnisse für <b>{0}</b>.</p></translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1232" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="835" /> <source><p>No package details info for <b>{0}</b> available.</p></source> <translation><p>Keine detaillierten Paketinformationen für <b>{0}</b> verfügbar.</p></translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1251" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="854" /> <source>Pip</source> <translation>Pip</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1253" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="856" /> <source>Install Pip</source> <translation>Pip installieren</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1256" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="859" /> <source>Install Pip to User-Site</source> <translation>Pip in Nutzerverzeichnis installieren</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1259" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="862" /> <source>Repair Pip</source> <translation>Pip reparieren</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1266" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="869" /> <source>Install</source> <translation>Installieren</translation> </message> <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1048" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="871" /> + <source>Install Packages</source> + <translation>Pakete installieren</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="874" /> + <source>Install Local Package</source> + <translation>Lokales Paket installieren</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="877" /> + <source>Re-Install Selected Packages</source> + <translation>Ausgewählte Pakete neu installieren</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="884" /> + <source>Requirements/Constraints</source> + <translation>Anforderungen/Constraints</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="886" /> + <source>Install Requirements</source> + <translation>Anforderungen installieren</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="889" /> + <source>Uninstall Requirements</source> + <translation>Anforderungen deinstallieren</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="892" /> + <source>Generate Requirements...</source> + <translation>Anforderungen erzeugen...</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="896" /> + <source>Install from 'pyproject.toml'</source> + <translation>Pakete gem. 'pyproject.toml' installieren</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="900" /> + <source>Uninstall from 'pyproject.toml'</source> + <translation>Pakete gem. 'pyproject.toml' deinstallieren</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="905" /> + <source>Generate Constraints...</source> + <translation>Constraints generieren...</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="912" /> + <source>Cache</source> + <translation>Zwischenspeicher</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="914" /> + <source>Show Cache Info...</source> + <translation>Zwischenspeicherinfo...</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="917" /> + <source>Show Cached Files...</source> + <translation>Zwischengespeicherte Dateien...</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="920" /> + <source>Remove Cached Files...</source> + <translation>Zwischengespeicherte Dateien löschen...</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="923" /> + <source>Purge Cache...</source> + <translation>Zwischenspeicher leeren...</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="940" /> + <source>Show Licenses...</source> + <translation>Lizenzen anzeigen...</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="944" /> + <source>Check Vulnerabilities</source> + <translation>Verwundbarkeiten prüfen</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="948" /> + <source>Update Vulnerability Database</source> + <translation>Verwundbarkeitsdatenbank aktualisieren</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="952" /> + <source>Create SBOM file</source> + <translation>STL Datei erzeugen</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="959" /> + <source>Edit User Configuration...</source> + <translation>Nutzerkonfiguration bearbeiten...</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="962" /> + <source>Edit Environment Configuration...</source> + <translation>Umgebungskonfiguration bearbeiten...</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="967" /> + <source>Configure...</source> + <translation>Einstellungen...</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1211" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1198" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1187" /> + <source>Edit Configuration</source> + <translation>Konfiguration bearbeiten</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1212" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1199" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1188" /> + <source>No valid configuration path determined. Aborting</source> + <translation>Es konnte kein gültiger Konfigurationspfad ermittelt werden. Abbruch</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1421" /> + <source>{0} {1}</source> + <comment>package name, package version</comment> + <translation>{0} {1}</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1442" /> + <source>Affected Version:</source> + <translation>Betroffene Version:</translation> + </message> + <message> <location filename="../PipInterface/PipPackagesWidget.py" line="1445" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1268" /> - <source>Install Packages</source> - <translation>Pakete installieren</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1271" /> - <source>Install Local Package</source> - <translation>Lokales Paket installieren</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1274" /> - <source>Re-Install Selected Packages</source> - <translation>Ausgewählte Pakete neu installieren</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1281" /> - <source>Requirements/Constraints</source> - <translation>Anforderungen/Constraints</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1283" /> - <source>Install Requirements</source> - <translation>Anforderungen installieren</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1286" /> - <source>Uninstall Requirements</source> - <translation>Anforderungen deinstallieren</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1289" /> - <source>Generate Requirements...</source> - <translation>Anforderungen erzeugen...</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1293" /> - <source>Install from 'pyproject.toml'</source> - <translation>Pakete gem. 'pyproject.toml' installieren</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1297" /> - <source>Uninstall from 'pyproject.toml'</source> - <translation>Pakete gem. 'pyproject.toml' deinstallieren</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1302" /> - <source>Generate Constraints...</source> - <translation>Constraints generieren...</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1309" /> - <source>Cache</source> - <translation>Zwischenspeicher</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1311" /> - <source>Show Cache Info...</source> - <translation>Zwischenspeicherinfo...</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1314" /> - <source>Show Cached Files...</source> - <translation>Zwischengespeicherte Dateien...</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1317" /> - <source>Remove Cached Files...</source> - <translation>Zwischengespeicherte Dateien löschen...</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1320" /> - <source>Purge Cache...</source> - <translation>Zwischenspeicher leeren...</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1337" /> - <source>Show Licenses...</source> - <translation>Lizenzen anzeigen...</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1341" /> - <source>Check Vulnerabilities</source> - <translation>Verwundbarkeiten prüfen</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1345" /> - <source>Update Vulnerability Database</source> - <translation>Verwundbarkeitsdatenbank aktualisieren</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1349" /> - <source>Create SBOM file</source> - <translation>STL Datei erzeugen</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1356" /> - <source>Edit User Configuration...</source> - <translation>Nutzerkonfiguration bearbeiten...</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1359" /> - <source>Edit Environment Configuration...</source> - <translation>Umgebungskonfiguration bearbeiten...</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1364" /> - <source>Configure...</source> - <translation>Einstellungen...</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1608" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1595" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1584" /> - <source>Edit Configuration</source> - <translation>Konfiguration bearbeiten</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1609" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1596" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1585" /> - <source>No valid configuration path determined. Aborting</source> - <translation>Es konnte kein gültiger Konfigurationspfad ermittelt werden. Abbruch</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1818" /> - <source>{0} {1}</source> - <comment>package name, package version</comment> - <translation>{0} {1}</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1839" /> - <source>Affected Version:</source> - <translation>Betroffene Version:</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1842" /> <source>Advisory:</source> <translation>Advisory:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1977" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1952" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1580" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1555" /> <source>unknown</source> <translation>unbekannt</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1974" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1577" /> <source>any</source> <translation>beliebig</translation> </message> @@ -61619,64 +61731,69 @@ <name>PluginRepositoryWidget</name> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="124" /> - <source>Stable</source> - <translation>Stabil</translation> + <source>Obsolete</source> + <translation>Überholt</translation> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="125" /> - <source>Unstable</source> - <translation>Instabil</translation> + <source>Stable</source> + <translation>Stabil</translation> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="126" /> - <source>Obsolete</source> - <translation>Überholt</translation> + <source>Unknown</source> + <translation>Unbekannt</translation> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="127" /> - <source>Unknown</source> - <translation>Unbekannt</translation> - </message> - <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="179" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="139" /> - <source>Update</source> - <translation>Aktualisieren</translation> + <source>Unstable</source> + <translation>Instabil</translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="128" /> + <source>Upgrade Available</source> + <translation>Aktualisierung verfügbar</translation> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="182" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="145" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="142" /> + <source>Update</source> + <translation>Aktualisieren</translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="185" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="148" /> <source>Download</source> <translation>Download</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="153" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="156" /> <source>Download & Install</source> <translation>Download & Installieren</translation> </message> <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="191" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="164" /> + <source>Cancel</source> + <translation /> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="170" /> + <source>Install</source> + <translation>Installieren</translation> + </message> + <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="188" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="161" /> - <source>Cancel</source> - <translation /> - </message> - <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="167" /> - <source>Install</source> - <translation>Installieren</translation> - </message> - <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="185" /> <source>Download && Install</source> <translation>Download && Installieren</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="191" /> - <source>Close && Install</source> - <translation>Schließen && Installieren</translation> - </message> - <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="194" /> + <source>Close && Install</source> + <translation>Schließen && Installieren</translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="197" /> <source>Close</source> <translation>Schließen</translation> </message> @@ -61728,98 +61845,103 @@ <translation>Die angeforderten Plugins wurden heruntergeladen.</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="603" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="591" /> <source>Plugins Repository URL Changed</source> <translation>Plugin-Repository-URL Geändert</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="604" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="592" /> <source>The URL of the Plugins Repository has changed. Select the "Update" button to get the new repository file.</source> <translation>Die URL des Plugin-Repositorys hat sich geändert. Wählen Sie den „Aktualisieren“-Knopf, um die neue Repositorydatei zu erhalten.</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="613" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="601" /> <source>Read plugins repository file</source> <translation>Plugins Repositorydatei lesen</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="614" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="602" /> <source><p>The plugins repository file <b>{0}</b> could not be read. Select Update</p></source> <translation><p>Die Plugins Repositorydatei <b>{0}</b> konnte nicht gelesen werden.</p></translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="623" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="611" /> <source>No plugin repository file available. Select Update.</source> <translation>Es ist keine Plugins-Repositorydatei verfügbar. Bitte „Aktualisieren“ drücken.</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="627" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="615" /> <source>New: <b>{0}</b></source> <translation>Neu:<b>{0}</b></translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="629" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="617" /> <source>Local Updates: <b>{0}</b></source> <translation>Lokale Aktualisierungen: <b>{0}</b></translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="632" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="620" /> <source>Remote Updates: <b>{0}</b></source> <translation>Entfernte Aktualisierungen: <b>{0}</b></translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="705" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="673" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="693" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="661" /> <source>Error downloading file</source> <translation>Fehler beim Herunterladen der Datei</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="706" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="674" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="694" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="662" /> <source><p>Could not download the requested file from {0}.</p><p>Error: {1}</p></source> <translation><p>Die angefragte Datei konnte nicht von {0} gedownloaded werden.</p><p>Fehler: {1}</p></translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="677" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="665" /> <source>No connection to Internet.</source> <translation>Keine Verbindung zum Internet.</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="849" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="810" /> <source>up-to-date</source> <translation>aktuell</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="852" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="813" /> <source>new download available</source> <translation>neuer Download verfügbar</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="856" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="818" /> <source>update installable</source> <translation>Aktualisierung installierbar</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="860" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="823" /> <source>updated download available</source> <translation>aktualisiertes Download verfügbar</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="864" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="828" /> <source>error determining status</source> <translation>Fehler bei der Ermittlung des Status</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1269" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1239" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1002" /> + <source>{0}. {1}</source> + <translation>{0}. {1}</translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1346" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1316" /> <source>Cleanup of Plugin Downloads</source> <translation>Wartung der Plugin Downloads</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1273" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1242" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1350" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1319" /> <source><p>The plugin download <b>{0}</b> could not be deleted.</p><p>Reason: {1}</p></source> <translation><p>Die Plugindatei <b>{0}</b> konnte nicht gelöscht werden.</p><p>Ursache: {1}</p></translation> </message> @@ -61827,17 +61949,17 @@ <context> <name>PluginRepositoryWindow</name> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1126" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1203" /> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1127" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1204" /> <source><p>Could not start the process.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Der Prozess konnte nicht gestartet werden.<br>Stellen Sie sicher, dass er als <b>{0}</b> verfügbar ist.</p></translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1131" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1208" /> <source>OK</source> <translation>OK</translation> </message> @@ -62214,18 +62336,18 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1908" /> + <location filename="../Preferences/__init__.py" line="1909" /> <source>Export Preferences</source> <translation>Einstellungen exportieren</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1937" /> - <location filename="../Preferences/__init__.py" line="1910" /> + <location filename="../Preferences/__init__.py" line="1938" /> + <location filename="../Preferences/__init__.py" line="1911" /> <source>Properties File (*.ini);;All Files (*)</source> <translation>Properties-Dateien (*.ini);;Alle Dateien (*)</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1935" /> + <location filename="../Preferences/__init__.py" line="1936" /> <source>Import Preferences</source> <translation>Einstellungen importieren</translation> </message> @@ -62783,79 +62905,79 @@ <translation>Conda Manager</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="273" /> + <location filename="../Preferences/ProgramsDialog.py" line="275" /> <source>PyPI Package Management</source> <translation>PyPI Paketverwaltung</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="525" /> - <location filename="../Preferences/ProgramsDialog.py" line="522" /> - <location filename="../Preferences/ProgramsDialog.py" line="506" /> - <location filename="../Preferences/ProgramsDialog.py" line="376" /> - <location filename="../Preferences/ProgramsDialog.py" line="309" /> - <location filename="../Preferences/ProgramsDialog.py" line="292" /> + <location filename="../Preferences/ProgramsDialog.py" line="527" /> + <location filename="../Preferences/ProgramsDialog.py" line="524" /> + <location filename="../Preferences/ProgramsDialog.py" line="508" /> + <location filename="../Preferences/ProgramsDialog.py" line="378" /> + <location filename="../Preferences/ProgramsDialog.py" line="311" /> + <location filename="../Preferences/ProgramsDialog.py" line="294" /> <source>(unknown)</source> <translation>(unbekannt)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="296" /> + <location filename="../Preferences/ProgramsDialog.py" line="298" /> <source>Spell Checker - PyEnchant</source> <translation>Rechtschreibprüfung – PyEnchant</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="313" /> + <location filename="../Preferences/ProgramsDialog.py" line="315" /> <source>Source Highlighter - Pygments</source> <translation>Quelltextfärber – Pygments</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="320" /> + <location filename="../Preferences/ProgramsDialog.py" line="322" /> <source>MicroPython - MPY Cross Compiler</source> <translation>MicroPython - MPY Cross Compiler</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="327" /> + <location filename="../Preferences/ProgramsDialog.py" line="329" /> <source>MicroPython - ESP Tool</source> <translation>MicroPython - ESP Werkzeug</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="338" /> + <location filename="../Preferences/ProgramsDialog.py" line="340" /> <source>MicroPython - PyBoard Flasher</source> <translation>MicroPython - PyBoard Flasher</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="348" /> + <location filename="../Preferences/ProgramsDialog.py" line="350" /> <source>MicroPython - STLink Info</source> <translation>MicroPython - STLink Info</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="358" /> + <location filename="../Preferences/ProgramsDialog.py" line="360" /> <source>MicroPython - STLink Flasher</source> <translation>MicroPython - STLink Flasher</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="380" /> + <location filename="../Preferences/ProgramsDialog.py" line="382" /> <source>Code Assistant - Jedi</source> <translation>Code Assistent - Jedi</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="460" /> + <location filename="../Preferences/ProgramsDialog.py" line="462" /> <source>(not configured)</source> <translation>(nicht konfiguriert)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="495" /> + <location filename="../Preferences/ProgramsDialog.py" line="497" /> <source>(module not found)</source> <translation>(Modul nicht gefunden)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="528" /> + <location filename="../Preferences/ProgramsDialog.py" line="530" /> <source>(not executable)</source> <translation>(nicht ausführbar)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="574" /> + <location filename="../Preferences/ProgramsDialog.py" line="576" /> + <location filename="../Preferences/ProgramsDialog.py" line="544" /> <location filename="../Preferences/ProgramsDialog.py" line="542" /> - <location filename="../Preferences/ProgramsDialog.py" line="540" /> <source>(not found)</source> <translation>(nicht gefunden)</translation> </message> @@ -67061,7 +67183,7 @@ <translation>Alt+R</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="306" /> + <location filename="../Project/PropertiesDialog.py" line="312" /> <location filename="../Project/PropertiesDialog.py" line="71" /> <source>None</source> <translation>Keiner</translation> @@ -67087,12 +67209,12 @@ <translation>Versionskontrolle steht für entfernte Projekte nicht zur Verfügung.</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="261" /> + <location filename="../Project/PropertiesDialog.py" line="267" /> <source>Source Files ({0});;All Files (*)</source> <translation>Quelldateien ({0});;Alle Dateien (*)</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="265" /> + <location filename="../Project/PropertiesDialog.py" line="271" /> <source>All Files (*)</source> <translation>Alle Dateien (*)</translation> </message> @@ -67133,22 +67255,22 @@ <context> <name>Purge</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="76" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/purge.py" line="83" /> <source>Purge All Files</source> <translation>Alle Dateien löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="77" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/purge.py" line="84" /> <source>Do really want to delete all files not tracked by Mercurial (including ignored ones)?</source> <translation>Wollen Sie wirklich alle Dateien, die nicht von Mercurial überwacht werden, inklusive ignorierter Dateien löschen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="82" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/purge.py" line="89" /> <source>Purge Files</source> <translation>Dateien löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="83" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/purge.py" line="90" /> <source>Do really want to delete files not tracked by Mercurial?</source> <translation>Wollen Sie wirklich alle Dateien, die nicht von Mercurial überwacht werden, löschen?</translation> </message> @@ -67156,79 +67278,115 @@ <context> <name>PurgeProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="36" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="34" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="36" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="34" /> <source>Purge Files</source> <translation>Dateien löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="43" /> - <source>Delete files and directories not known to Mercurial</source> - <translation>Dateien und Verzeichnis, die Mercurial unbekannt sind, löschen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="46" /> - <source><b>Purge Files</b><p>This deletes files and directories not known to Mercurial. That means that purge will delete:<ul><li>unknown files (marked with "not tracked" in the status dialog)</li><li>empty directories</li></ul>Note that ignored files will be left untouched.</p></source> - <translation><b>Dateien löschen</b><p>Dies löscht Dateien und Verzeichnis, die Mercurial unbekannt sind. Diese Elemente werden gelöscht:<ul><li>unbekannte Dateien (mit „nicht versioniert“ im Statusdialog markiert)</li><li>leere Verzeichnisse</li></ul>Hinweis: Ignorierte Dateien werden nicht berührt.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="61" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="60" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="43" /> + <source>Delete not version controlled files and directories</source> + <translation>Nicht versionierte Dateien und Verzeichnisse löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="46" /> + <source><b>Purge Files</b><p>This deletes not version controlled files and directories. That means that purge will delete:<ul><li>not version controlled files (marked with "not tracked" in the status dialog)</li><li>empty directories</li></ul>Note that ignored files will be left untouched.</p></source> + <translation><b>Dateien löschen</b><p>Dies löscht nicht versionierte Dateien und Verzeichnisse. Diese Elemente werden gelöscht:<ul><li>nicht versionierte Dateien (mit „nicht versioniert“ im Statusdialog markiert)</li><li>leere Verzeichnisse</li></ul>Hinweis: Ignorierte Dateien werden nicht berührt.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="61" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="60" /> <source>Purge All Files</source> <translation>Alle Dateien löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="68" /> - <source>Delete files and directories not known to Mercurial including ignored ones</source> - <translation>Dateien und Verzeichnis, die Mercurial unbekannt sind, inklusive ignorierter Dateien löschen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="74" /> - <source><b>Purge All Files</b><p>This deletes files and directories not known to Mercurial. That means that purge will delete:<ul><li>unknown files (marked with "not tracked" in the status dialog)</li><li>empty directories</li><li>ignored files and directories</li></ul></p></source> - <translation><b>Dateien löschen</b><p>Dies löscht Dateien und Verzeichnis, die Mercurial unbekannt sind. Diese Elemente werden gelöscht:<ul><li>unbekannte Dateien (mit „nicht versioniert“ im Statusdialog markiert)</li><li>leere Verzeichnisse</li><li>ignorierte Dateien und Verzeichnisse</li></ul></p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="89" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="68" /> + <source>Delete not version controlled files and directories including ignored ones</source> + <translation>Nicht versionierte Dateien und Verzeichnisse inklusive ignorierter löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="74" /> + <source><b>Purge All Files</b><p>This deletes not version controlled files and directories. That means that purge will delete:<ul><li>not version controlled files (marked with "not tracked" in the status dialog)</li><li>empty directories</li><li>ignored files and directories</li></ul></p></source> + <translation><b>Alle Dateien löschen</b><p>Dies löscht nicht versionierte Dateien und Verzeichnisse. Diese Elemente werden gelöscht:<ul><li>nicht versionierte Dateien (mit „nicht versioniert“ im Statusdialog markiert)</li><li>leere Verzeichnisse</li><li>ignorierte Dateien und Verzeichnisse</li></ul></p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="90" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="89" /> + <source>Purge Ignored Files</source> + <translation>Ignorierte Dateien löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="97" /> + <source>Delete ignored files and directories</source> + <translation>Ignorierte Dateien und Verzeichnisse löschen</translation> + </message> + <message> + <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><b>Ignorierte Dateien löschen</b><p>Dies löscht ignorierte Dateien und Verzeichnisse.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="109" /> <source>List Files to be Purged</source> <translation>Zu löschende Dateien auflisten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="91" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="111" /> <source>List Files to be Purged...</source> <translation>Zu löschende Dateien auflisten...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="98" /> - <source>List files and directories not known to Mercurial</source> - <translation>Liste Dateien und Verzeichnisse, die Mercurial nicht bekannt sind, auf</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="101" /> - <source><b>List Files to be Purged</b><p>This lists files and directories not known to Mercurial. These would be deleted by the "Purge Files" menu entry.</p></source> - <translation><b>Zu löschende Dateien auflisten</b><p>Dies listet Dateien und Verzeichnisse, die Mercurial nicht bekannt sind, auf. Diese würden über den Menüeintrag „Dateien löschen“ gelöscht werden.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="111" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="118" /> + <source>List not version controlled files and directories</source> + <translation>Liste nicht versionierte Dateien und Verzeichnisse auf</translation> + </message> + <message> + <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><b>Zu löschende Dateien auflisten</b><p>Dies listet nicht versionierte Dateien und Verzeichnisse auf. Diese würden über den Menüeintrag „Dateien löschen“ gelöscht werden.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="131" /> <source>List All Files to be Purged</source> <translation>Alle zu löschenden Dateien auflisten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="112" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="132" /> <source>List All Files to be Purged...</source> <translation>Alle zu löschenden Dateien auflisten...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="119" /> - <source>List files and directories not known to Mercurial including ignored ones</source> - <translation>Liste Dateien und Verzeichnisse, die Mercurial nicht bekannt sind, inklusive ignorierter Dateien auf</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="125" /> - <source><b>List All Files to be Purged</b><p>This lists files and directories not known to Mercurial including ignored ones. These would be deleted by the "Purge All Files" menu entry.</p></source> - <translation><b>Alle zu löschenden Dateien auflisten</b><p>Dies listet Dateien und Verzeichnisse, die Mercurial nicht bekannt sind, inklusive ignorierter Dateien auf. Diese würden über den Menüeintrag „Alle Dateien löschen“ gelöscht werden.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="163" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="139" /> + <source>List not version controlled files and directories including ignored ones</source> + <translation>Liste nicht versionierte inklusive ignorierte Dateien und Verzeichnisse auf</translation> + </message> + <message> + <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><b>Alle zu löschenden Dateien auflisten</b><p>Dies listet nicht versionierte inklusive ignorierte Dateien und Verzeichnisse auf. Diese würden über den Menüeintrag „Alle Dateien löschen“ gelöscht werden.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="156" /> + <source>List Ignored Files to be Purged</source> + <translation>Zu löschende ignorierte Dateien auflisten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="157" /> + <source>List Ignored Files to be Purged...</source> + <translation>Zu löschende ignorierte Dateien auflisten...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="164" /> + <source>List ignored files and directories</source> + <translation>Liste ignorierte Dateien und Verzeichnisse auf</translation> + </message> + <message> + <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><b>Zu löschende ignorierte Dateien auflisten</b><p>Dies listet ignorierte Dateien und Verzeichnisse auf. iese würden über den Menüeintrag „Ignorierte Dateien löschen“ gelöscht werden.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="206" /> <source>Purge</source> <translation>Purge</translation> </message> @@ -76226,49 +76384,49 @@ <context> <name>Shelve</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="105" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="105" /> <source>Shelve current changes</source> <translation>Aktuelle Änderungen ablegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="151" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="151" /> <source>Restore shelved changes</source> <translation>Ablage wiederherstellen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="170" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="170" /> <source>Abort restore operation</source> <translation>Wiederherstellung abbrechen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="191" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="191" /> <source>Continue restore operation</source> <translation>Wiederherstellung fortsetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="211" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="211" /> <source>Select the shelves to be deleted:</source> <translation>Wähle die zu löschenden Ablagen aus:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="231" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="222" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="231" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="222" /> <source>Delete shelves</source> <translation>Ablagen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="223" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="223" /> <source>Do you really want to delete these shelves?</source> <translation>Sollen diese Ablagen wirklich gelöscht werden?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="249" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="242" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="249" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="242" /> <source>Delete all shelves</source> <translation>Alle Ablagen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="243" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="243" /> <source>Do you really want to delete all shelved changes?</source> <translation>Sollen wirklich alle Ablagen gelöscht werden?</translation> </message> @@ -76276,21 +76434,21 @@ <context> <name>ShelveProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="62" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="57" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="52" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="47" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="62" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="57" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="52" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="47" /> <source>Shelve changes</source> <translation>Änderungen ablegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="122" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="74" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="122" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="74" /> <source>Shelve</source> <translation>Ablage</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="104" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="104" /> <source>The project should be reread. Do this now?</source> <translation>Das Projekt sollte neu gelesen werde. Jetzt durchführen?</translation> </message> @@ -76298,154 +76456,154 @@ <context> <name>ShelveProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="34" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="34" /> <source>Shelve changes</source> <translation>Änderungen ablegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="35" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="35" /> <source>Shelve changes...</source> <translation>Änderungen ablegen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="42" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="42" /> <source>Shelve all current changes of the project</source> <translation>Alle aktuellen Änderungen des Projektes ablegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="45" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="45" /> <source><b>Shelve changes</b><p>This shelves all current changes of the project.</p></source> <translation><b>Änderungen ablegen</b<p>Dies legt alle aktuellen Änderungen des Projektes ab.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="54" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="54" /> <source>Show shelve browser</source> <translation>Zeige Ablagen Browser</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="55" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="55" /> <source>Show shelve browser...</source> <translation>Zeige Ablagen Browser...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="61" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="61" /> <source>Show a dialog with all shelves</source> <translation>Zeigt einen Dialog mit allen Ablagen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="63" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="63" /> <source><b>Show shelve browser...</b><p>This shows a dialog listing all available shelves. Actions on these shelves may be executed via the context menu.</p></source> <translation><b>Zeige Ablagen Browser</b<p>Dies zeigt einen Dialog mit allen Ablagen.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="74" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="74" /> <source>Restore shelved change</source> <translation>Ablage wiederherstellen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="75" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="75" /> <source>Restore shelved change...</source> <translation>Ablage wiederherstellen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="82" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="82" /> <source>Restore a shelved change to the project directory</source> <translation>Stellt abgelegt Änderungen wieder im Projektverzeichnis her</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="85" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="85" /> <source><b>Restore shelved change</b><p>This restore a shelved change to the project directory.</p></source> <translation><b>Ablage wiederherstellen</b<p>Dies stellt abgelegt Änderungen wieder im Projektverzeichnis her.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="95" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="95" /> <source>Abort restore</source> <translation>Wiederherstellung abbrechen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="96" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="96" /> <source>Abort restore...</source> <translation>Wiederherstellung abbrechen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="103" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="103" /> <source>Abort the restore operation in progress</source> <translation>Bricht den aktuellen Wiederherstellungsprozess ab</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="106" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="106" /> <source><b>Abort restore</b><p>This aborts the restore operation in progress and reverts already applied changes.</p></source> <translation><b>Wiederherstellung abbrechen</b<p>Dies bricht den aktuellen Wiederherstellungsprozess ab.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="116" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="116" /> <source>Continue restore</source> <translation>Wiederherstellung fortsetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="117" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="117" /> <source>Continue restore...</source> <translation>Wiederherstellung fortsetzen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="124" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="124" /> <source>Continue the restore operation in progress</source> <translation>Setzt den aktuellen Wiederherstellungsprozess fort</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="127" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="127" /> <source><b>Continue restore</b><p>This continues the restore operation in progress.</p></source> <translation><b>Wiederherstellung fortsetzen</b<p>Dies setzt den aktuellen Wiederherstellungsprozess fort.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="136" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="136" /> <source>Delete shelved changes</source> <translation>Ablagen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="137" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="137" /> <source>Delete shelved changes...</source> <translation>Ablagen löschen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="144" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="144" /> <source><b>Delete shelved changes...</b><p>This opens a dialog to select the shelved changes to delete and deletes the selected ones.</p></source> <translation><b>Ablagen löschen...</b<p>Dies öffnet einen Dialog zur Auswahl zu löschender Ablagen und löscht sie.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="155" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="154" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="155" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="154" /> <source>Delete ALL shelved changes</source> <translation>ALLE Ablagen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="162" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="162" /> <source><b>Delete ALL shelved changes</b><p>This deletes all shelved changes.</p></source> <translation><b>ALLE Ablagen löschen</b<p>Dies löscht alle Ablagen.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="231" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="202" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="231" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="202" /> <source>Shelve</source> <translation>Ablage</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="218" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="218" /> <source>The project should be reread. Do this now?</source> <translation>Das Projekt sollte neu gelesen werde. Jetzt durchführen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="244" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="244" /> <source>Unshelve</source> <translation>Ablage weiderherstellen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="251" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="251" /> <source>Abort Unshelve</source> <translation>Wiederherstellung abbrechen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="258" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="258" /> <source>Continue Unshelve</source> <translation>Wiederherstellung fortsetzen</translation> </message> @@ -79086,44 +79244,6 @@ </message> </context> <context> - <name>Strip</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/strip.py" line="68" /> - <source>Stripping changesets from repository</source> - <translation>Änderungssätze aus dem Repository löschen</translation> - </message> - </context> - <context> - <name>StripProjectHelper</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="37" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="35" /> - <source>Strip changesets</source> - <translation>Änderungssätze löschen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="43" /> - <source>Strip changesets from a repository</source> - <translation>Änderungssätze aus einem Repository löschen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="45" /> - <source><b>Strip changesets</b><p>This deletes a changeset and all its descendants from a repository. Each removed changeset will be stored in .hg/strip-backup as a bundle file.</p></source> - <translation><b>Änderungssätze löschen</b><p>Dies löscht einen Änderungssatz und all seine Kinder aus einem Repository. Jeder gelöschte Änderungssatz wird in .hg/strip-backup als Änderungssatzdatei gespeichert.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="91" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="79" /> - <source>Strip</source> - <translation>Strip</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="92" /> - <source>The project should be reread. Do this now?</source> - <translation>Das Projekt sollte neu gelesen werde. Jetzt durchführen?</translation> - </message> - </context> - <context> <name>SubstyleDefinitionDialog</name> <message> <location filename="../Preferences/SubstyleDefinitionDialog.py" line="44" /> @@ -80235,12 +80355,12 @@ <context> <name>SvnDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="165" /> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="168" /> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="166" /> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="169" /> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> @@ -90736,6 +90856,66 @@ </message> </context> <context> + <name>Uncommit</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/uncommit.py" line="64" /> + <source>Undo Local Commit</source> + <translation>Lokales Commit rückgängig machen</translation> + </message> + </context> + <context> + <name>UncommitProjectBrowserHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="145" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="82" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="72" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="62" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="52" /> + <source>Undo Local Commit</source> + <translation>Lokales Commit rückgängig machen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="96" /> + <source>Uncommit</source> + <translation>Uncommit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="126" /> + <source>The project should be reread. Do this now?</source> + <translation>Das Projekt sollte neu gelesen werde. Jetzt durchführen?</translation> + </message> + </context> + <context> + <name>UncommitProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="107" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="38" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="36" /> + <source>Undo Local Commit</source> + <translation>Lokales Commit rückgängig machen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="44" /> + <source>Undo the effect of a local commit.</source> + <translation>Macht die Auzswirkungen eines lokalen Commit rückgängig.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="46" /> + <source><b>Undo Local Commit</b><p>This undoes the effect of a local commit, returning the affected files to their uncommitted state.</p></source> + <translation><b>Lokales Commit rückgängig machen</b><p>Dies macht die Auzswirkungen eines lokalen Commit rückgängig. Betroffene Dateien werden in ihren veränderten Zustand zurückversetzt.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="79" /> + <source>Uncommit</source> + <translation>Uncommit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="95" /> + <source>The project should be reread. Do this now?</source> + <translation>Das Projekt sollte neu gelesen werde. Jetzt durchführen?</translation> + </message> + </context> + <context> <name>UnittestExecutor</name> <message> <location filename="../Testing/Interfaces/UnittestExecutor.py" line="52" /> @@ -91383,7 +91563,7 @@ <translation><b>Sitzung speichern...</b><p>Dies speichert die aktuelle Sitzung in eine Datei. Es wird ein Dialog zur Eingabe des Dateinamens geöffnet.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7892" /> + <location filename="../UI/UserInterface.py" line="7893" /> <location filename="../UI/UserInterface.py" line="1955" /> <location filename="../UI/UserInterface.py" line="1948" /> <source>Load session</source> @@ -92711,8 +92891,8 @@ <translation><b>Tastaturkurzbefehle</b><p>Setze die Tastaturkurzbefehle der Applikation mit den bevorzugten Werten.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7600" /> - <location filename="../UI/UserInterface.py" line="7581" /> + <location filename="../UI/UserInterface.py" line="7601" /> + <location filename="../UI/UserInterface.py" line="7582" /> <location filename="../UI/UserInterface.py" line="3402" /> <source>Export Keyboard Shortcuts</source> <translation>Tastaturkurzbefehle exportieren</translation> @@ -92733,7 +92913,7 @@ <translation><b>Tastaturkurzbefehle exportieren</b><p>Exportiert die Tastaturkurzbefehle der Applikation.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7619" /> + <location filename="../UI/UserInterface.py" line="7620" /> <location filename="../UI/UserInterface.py" line="3421" /> <source>Import Keyboard Shortcuts</source> <translation>Tastaturkurzbefehle importieren</translation> @@ -93466,169 +93646,169 @@ </translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7108" /> - <location filename="../UI/UserInterface.py" line="7046" /> - <location filename="../UI/UserInterface.py" line="7002" /> - <location filename="../UI/UserInterface.py" line="6928" /> - <location filename="../UI/UserInterface.py" line="6864" /> - <source>Documentation Missing</source> - <translation>Dokumentation fehlt</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="7109" /> <location filename="../UI/UserInterface.py" line="7047" /> <location filename="../UI/UserInterface.py" line="7003" /> <location filename="../UI/UserInterface.py" line="6929" /> <location filename="../UI/UserInterface.py" line="6865" /> + <source>Documentation Missing</source> + <translation>Dokumentation fehlt</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7110" /> + <location filename="../UI/UserInterface.py" line="7048" /> + <location filename="../UI/UserInterface.py" line="7004" /> + <location filename="../UI/UserInterface.py" line="6930" /> + <location filename="../UI/UserInterface.py" line="6866" /> <source><p>The documentation starting point "<b>{0}</b>" could not be found.</p></source> <translation><p>Der Dokumentationsstartpunkt „<b>{0}</b>“ konnte nicht gefunden werden.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7090" /> - <location filename="../UI/UserInterface.py" line="6972" /> - <source>Documentation</source> - <translation>Dokumentation</translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="6973" /> - <source><p>The PyQt{0} documentation starting point has not been configured.</p></source> - <translation><p>Der PyQt{0}-Dokumentations-Startpunkt ist nicht konfiguriert.</p></translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="7091" /> + <location filename="../UI/UserInterface.py" line="6973" /> + <source>Documentation</source> + <translation>Dokumentation</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="6974" /> + <source><p>The PyQt{0} documentation starting point has not been configured.</p></source> + <translation><p>Der PyQt{0}-Dokumentations-Startpunkt ist nicht konfiguriert.</p></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7092" /> <source><p>The PySide{0} documentation starting point has not been configured.</p></source> <translation><p>Der PySide{0}-Dokumentations-Startpunkt ist nicht konfiguriert.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7270" /> - <location filename="../UI/UserInterface.py" line="7206" /> - <source>Start Web Browser</source> - <translation>Web Browser starten</translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="7207" /> - <source>The eric web browser could not be started.</source> - <translation>Der eric Web Browser konnte nicht gestartet werden.</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="7271" /> + <location filename="../UI/UserInterface.py" line="7207" /> + <source>Start Web Browser</source> + <translation>Web Browser starten</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7208" /> + <source>The eric web browser could not be started.</source> + <translation>Der eric Web Browser konnte nicht gestartet werden.</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7272" /> <source><p>The eric web browser is not started.</p><p>Reason: {0}</p></source> <translation><p>Der eric Web Browser ist nicht gestartet.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7317" /> + <location filename="../UI/UserInterface.py" line="7318" /> <source>Open Browser</source> <translation>Browser starten</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7317" /> + <location filename="../UI/UserInterface.py" line="7318" /> <source>Could not start a web browser</source> <translation>Der System Web Browser konnte nicht gestartet werden</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7621" /> - <location filename="../UI/UserInterface.py" line="7583" /> + <location filename="../UI/UserInterface.py" line="7622" /> + <location filename="../UI/UserInterface.py" line="7584" /> <source>Keyboard Shortcuts File (*.ekj)</source> <translation>Tastaturkurzbefehlsdatei (*.ekj)</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7601" /> + <location filename="../UI/UserInterface.py" line="7602" /> <source><p>The keyboard shortcuts file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Die Tastaturkurzbefehlsdatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7805" /> + <location filename="../UI/UserInterface.py" line="7806" /> <source>Load crash session...</source> <translation>Absturzsicherung laden...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7808" /> + <location filename="../UI/UserInterface.py" line="7809" /> <source>Clean crash sessions...</source> <translation>Absturzsicherungen bereinigen...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7845" /> - <source>Read Session</source> - <translation>Sitzung lesen</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="7846" /> + <source>Read Session</source> + <translation>Sitzung lesen</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7847" /> <source><p>The session file <b>{0}</b> could not be read.</p></source> <translation><p>Die Sitzungsdatei <b>{0}</b> konnte nicht gelesen werden.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7869" /> + <location filename="../UI/UserInterface.py" line="7870" /> <source>Save Session</source> <translation>Sitzung speichern</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7894" /> - <location filename="../UI/UserInterface.py" line="7871" /> + <location filename="../UI/UserInterface.py" line="7895" /> + <location filename="../UI/UserInterface.py" line="7872" /> <source>eric Session Files (*.esj)</source> <translation>eric Sitzungsdateien (*.esj)</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7963" /> - <source>Found Crash Sessions</source> - <translation>Absturzsicherungen gefunden</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="7964" /> + <source>Found Crash Sessions</source> + <translation>Absturzsicherungen gefunden</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7965" /> <source>These crash session files were found. Select the one to open. Select 'Cancel' to not open a crash session.</source> <translation>Diese Absturzsicherungen wurden gefunden. Wähle die zu öffnende aus. Wähle 'Abbrechen', wenn keine geladen werden soll.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="8037" /> - <source>Clean stale crash sessions</source> - <translation>Veraltete Absturzsicherungen bereinigen</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="8038" /> + <source>Clean stale crash sessions</source> + <translation>Veraltete Absturzsicherungen bereinigen</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8039" /> <source>Do you really want to delete these stale crash session files?</source> <translation>Sollen wirklich diese veralteten Absturzsicherungen gelöscht werden?</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="8414" /> - <source>Drop Error</source> - <translation>Drop-Fehler</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="8415" /> + <source>Drop Error</source> + <translation>Drop-Fehler</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8416" /> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> ist keine Datei.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="8612" /> - <source>Upgrade available</source> - <translation>Aktualisierung verfügbar</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="8613" /> + <source>Upgrade available</source> + <translation>Aktualisierung verfügbar</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8614" /> <source><p>A newer version of the <b>eric-ide</b> package is available at <a href="{0}/eric-ide/">PyPI</a>.</p><p>Installed: {1}<br/>Available: <b>{2}</b></p><p>Shall <b>eric-ide</b> be upgraded?</p></source> <translation><p>Eine neuere Version des <b>eric-ide</b> Paketes ist auf <a href="{0}/eric-ide/">PyPI</a> verfügbar.</p><p>Installiert: {1}<br/>Verfügbar: <b>{2}</b></p><p>Soll <b>eric-ide</b> aktualisiert werden?</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="8661" /> - <source>First time usage</source> - <translation>Erstmalige Nutzung</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="8662" /> + <source>First time usage</source> + <translation>Erstmalige Nutzung</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8663" /> <source>eric has not been configured yet. The configuration dialog will be started.</source> <translation>eric wurde noch nicht konfiguriert. Der Konfigurationsdialog wird nun gestartet.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="8684" /> + <location filename="../UI/UserInterface.py" line="8685" /> <source>Select Workspace Directory</source> <translation>Wähle Arbeitsverzeichnis</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="8852" /> - <source>Unsaved Data Detected</source> - <translation>Nicht gespeicherte Daten gefunden</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="8853" /> + <source>Unsaved Data Detected</source> + <translation>Nicht gespeicherte Daten gefunden</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8854" /> <source>Some editors contain unsaved data. Shall these be saved?</source> <translation>Einige Editoren haben nicht gespeicherte Inhalte. Sollen diese gespeichert werden?</translation> </message> @@ -100669,8 +100849,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>&Browsing History</source> - <translation>&Web-Chronik</translation> + <source>Browsing History</source> + <translation>Web-Chronik</translation> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100709,8 +100889,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>&Search History</source> - <translation>&Such-Chronik</translation> + <source>Search History</source> + <translation>Such-Chronik</translation> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100719,8 +100899,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>Download &History</source> - <translation>Down&load Chronik</translation> + <source>Download History</source> + <translation>Download Chronik</translation> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100729,8 +100909,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>&Cookies</source> - <translation>&Cookies</translation> + <source>Cookies</source> + <translation>Cookies</translation> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100739,8 +100919,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>Cached &Web Pages</source> - <translation>Ge&pufferte Web-Seiten</translation> + <source>Cached Web Pages</source> + <translation>Gepufferte Web-Seiten</translation> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100749,8 +100929,18 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>Website &Icons</source> - <translation>Webseiten-S&ymbole</translation> + <source>Website Icons</source> + <translation>Webseiten-Symbole</translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> + <source>Select to clear the website permissions</source> + <translation>Auswählen, um die Webseiten-Erlaubnisse zu löschen</translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> + <source>Website Permissions</source> + <translation>Webseiten-Erlaubnisse</translation> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100759,8 +100949,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>Saved &Passwords</source> - <translation>Gespeicherte &Kennwörter</translation> + <source>Saved Passwords</source> + <translation>Gespeicherte Passwörter</translation> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100769,8 +100959,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>&Zoom Settings</source> - <translation>&Zoomeinstellungen</translation> + <source>Zoom Settings</source> + <translation>Zoomeinstellungen</translation> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -101313,6 +101503,16 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/WebBrowserPage.ui" line="0" /> + <source>Select to store website permission settings in memory only.</source> + <translation>Auswählen, um die Website-Erlaubnisse nur im Hauptspeicher abzulegen.</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserPage.ui" line="0" /> + <source>Do not persist website permissions</source> + <translation>Website-Erlaubnisse nicht dauerhaft speichern</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserPage.ui" line="0" /> <source><p>Select to allow reading from all canvas elements.</p> <p><b>Note:</b> Disable this option to prevent canvas fingerprinting.</p></source> <translation><p>Wählen Sie diese Option, um das Lesen von allen Canvas-Elementen zu erlauben.</p> @@ -101743,32 +101943,87 @@ <translation><b>Hinweis:</b> Höhere Werte für den Teiler verlangsamen das Rollen.</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="194" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="78" /> + <source><p>Allow <b>{0}</b> to access your location information?</p></source> + <translation><p>Zulassen, dass <b>{0}</b> auf die Positionsdaten zugreift?</p></translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="83" /> + <source><p>Allow <b>{0}</b> to access your microphone?</p></source> + <translation><p>Zulassen, dass <b>{0}</b> auf das Mikrofon zugreift?</p></translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="89" /> + <source><p>Allow <b>{0}</b> to access your webcam?</p></source> + <translation><p>Zulassen, dass <b>{0}</b> auf die Videokamera zugreift?</p></translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="95" /> + <source><p>Allow <b>{0}</b> to access your microphone and webcam?</p></source> + <translation><p>Zulassen, dass <b>{0}</b> auf das Mikrofon und die Videokamera zugreift?</p></translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="100" /> + <source><p>Allow <b>{0}</b> to lock your mouse cursor?</p></source> + <translation><p>Zulassen, dass <b>{0}</b> den Mauscursor verriegelt?</p></translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="105" /> + <source><p>Allow <b>{0}</b> to capture video of your desktop?</p></source> + <translation><p>Zulassen, dass <b>{0}</b> Videoaufnahmen des Desktops erstellt?</p></translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="111" /> + <source><p>Allow <b>{0}</b> to capture audio and video of your desktop?</p></source> + <translation><p>Zulassen, dass <b>{0}</b> Ton- und Videoaufnahmen des Desktops erstellt?</p></translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="118" /> + <source><p>Allow <b>{0}</b> to show notifications on your desktop?</p></source> + <translation><p>Zulassen, dass <b>{0}</b> Benachrichtigungen anzeigt?</p></translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="124" /> + <source><p>Allow <b>{0}</b> to read from and write to the clipboard?</p></source> + <translation><p>Zulassen, dass <b>{0}</b> die Zwischenablage liest und beschreibt?</p></translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="130" /> + <source><p>Allow <b>{0}</b> to access fonts stored on this machine?</p></source> + <translation><p>Zulassen, dass <b>{0}</b> auf lokale Schriften zugreift?</p></translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="269" /> <source>Suspicuous URL detected</source> <translation>Fragwürdige URL entdeckt</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="195" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="270" /> <source><p>The URL <b>{0}</b> was found in the Safe Browsing database.</p>{1}</source> <translation><p>Die URL <b>{0}</b> wurde in der Safe Browsing Datenbank gefunden.</p>{1}</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="541" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="396" /> + <source>Permission Request</source> + <translation>Erlaubnisanfrage</translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="636" /> <source>Register Protocol Handler</source> <translation>Protokoll Handler Registrierung</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="542" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="637" /> <source><p>Allow the Web Site <b>{0}</b> to handle all <b>{1}</b> links?</p></source> <translation><p>Der Website <b>{0}></b> erlauben, alle <b>{1}</b> Links zu behandeln?</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="631" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="726" /> <source>SSL Info</source> <translation>SSL Info</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="632" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="727" /> <source>This site does not contain SSL information.</source> <translation>Diese Seite enthält keine SSL Information.</translation> </message> @@ -104364,15 +104619,15 @@ <translation>Aktuelle Seite prüfen</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5231" /> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5221" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5248" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5238" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2220" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2218" /> <source>IP Address Report</source> <translation>IP Adressenbericht</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5245" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5262" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2232" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2230" /> <source>Domain Report</source> @@ -104399,8 +104654,8 @@ <translation><b>Tastaturkurzbefehle</b><p>Setze die Tastaturkurzbefehle der Applikation mit den bevorzugten Werten.</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5651" /> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5632" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5675" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5656" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2270" /> <source>Export Keyboard Shortcuts</source> <translation>Tastaturkurzbefehle exportieren</translation> @@ -104421,7 +104676,7 @@ <translation><b>Tastaturkurzbefehle exportieren</b><p>Exportiert die Tastaturkurzbefehle der Applikation.</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5671" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5695" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2289" /> <source>Import Keyboard Shortcuts</source> <translation>Tastaturkurzbefehle importieren</translation> @@ -104672,100 +104927,100 @@ <translation>Hilfe</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4768" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4785" /> <source>System</source> <translation>System</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4772" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4789" /> <source>ISO</source> <translation>ISO</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4775" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4792" /> <source>Unicode</source> <translation>Unicode</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4778" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4795" /> <source>Windows</source> <translation>Windows</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4781" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4798" /> <source>IBM</source> <translation>IBM</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4784" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4801" /> <source>Apple</source> <translation>Apple</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4787" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4804" /> <source>Other</source> <translation>Sonstige</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4814" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4831" /> <source>Menu Bar</source> <translation>Menüleiste</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4819" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4836" /> <source>Bookmarks</source> <translation>Lesezeichen</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4824" /> - <source>Status Bar</source> - <translation>Statusleiste</translation> - </message> - <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4839" /> - <source>&Show all</source> - <translation>Alle an&zeigen</translation> - </message> - <message> <location filename="../WebBrowser/WebBrowserWindow.py" line="4841" /> + <source>Status Bar</source> + <translation>Statusleiste</translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4856" /> + <source>&Show all</source> + <translation>Alle an&zeigen</translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4858" /> <source>&Hide all</source> <translation>Alle &ausblenden</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5187" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5204" /> <source>VirusTotal Scan</source> <translation>VirusTotal-Prüfung</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5188" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5205" /> <source><p>The VirusTotal scan could not be scheduled.<p> <p>Reason: {0}</p></source> <translation><p>Die VirusTotal-Prüfung konnte nicht beauftragt werden.<p> <p>Ursache: {0}</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5222" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5239" /> <source>Enter a valid IPv4 address in dotted quad notation:</source> <translation>Gib eine gültige IPv4 Adresse in Vierpunktnotation ein:</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5232" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5249" /> <source>The given IP address is not in dotted quad notation.</source> <translation>Die eingegebene IP Adresse ist nicht in Vierpunktnotation.</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5246" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5263" /> <source>Enter a valid domain name:</source> <translation>Gib einen gültigen Domänennamen ein:</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5673" /> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5634" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5697" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5658" /> <source>Keyboard Shortcuts File (*.ekj)</source> <translation>Tastaturkurzbefehlsdatei (*.ekj)</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5652" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5676" /> <source><p>The keyboard shortcuts file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Die Tastaturkurzbefehlsdatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> @@ -105870,32 +106125,32 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1383" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1389" /> <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>Vorgänger #{0}</b></td><td></td></tr> <tr><td><b>Änderungssatz</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1955" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1391" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1964" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397" /> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Marken</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1961" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1970" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1403" /> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Lesezeichen</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1968" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1404" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1977" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1410" /> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Zweige</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1410" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1416" /> <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> @@ -105904,7 +106159,7 @@ <tr><td><b>Committed um</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1429" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1435" /> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -105915,38 +106170,38 @@ <translation /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1929" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1938" /> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation><tr><td><b>Kopf #{0}</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1936" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945" /> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation><tr><td><b>Vorgänger #{0}</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1943" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1952" /> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Spitze</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1948" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1957" /> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Änderungssatz</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1975" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1984" /> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Vorgänger</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1981" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990" /> <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>
--- a/src/eric7/i18n/eric7_empty.ts Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/i18n/eric7_empty.ts Tue Jan 14 17:29:56 2025 +0100 @@ -7649,18 +7649,18 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="896" /> + <location filename="../Preferences/ConfigurationDialog.py" line="903" /> <location filename="../Preferences/ConfigurationDialog.py" line="228" /> <source>Hex Editor</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1129" /> - <location filename="../Preferences/ConfigurationDialog.py" line="1090" /> - <location filename="../Preferences/ConfigurationDialog.py" line="982" /> - <location filename="../Preferences/ConfigurationDialog.py" line="944" /> - <location filename="../Preferences/ConfigurationDialog.py" line="913" /> - <location filename="../Preferences/ConfigurationDialog.py" line="882" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1136" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1097" /> + <location filename="../Preferences/ConfigurationDialog.py" line="989" /> + <location filename="../Preferences/ConfigurationDialog.py" line="951" /> + <location filename="../Preferences/ConfigurationDialog.py" line="920" /> + <location filename="../Preferences/ConfigurationDialog.py" line="889" /> <location filename="../Preferences/ConfigurationDialog.py" line="785" /> <location filename="../Preferences/ConfigurationDialog.py" line="670" /> <location filename="../Preferences/ConfigurationDialog.py" line="235" /> @@ -7678,7 +7678,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1104" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1111" /> <location filename="../Preferences/ConfigurationDialog.py" line="250" /> <source>MicroPython</source> <translation type="unfinished" /> @@ -7695,8 +7695,9 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1111" /> - <location filename="../Preferences/ConfigurationDialog.py" line="958" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1118" /> + <location filename="../Preferences/ConfigurationDialog.py" line="965" /> + <location filename="../Preferences/ConfigurationDialog.py" line="806" /> <location filename="../Preferences/ConfigurationDialog.py" line="271" /> <source>Network Proxy</source> <translation type="unfinished" /> @@ -7707,13 +7708,13 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="927" /> + <location filename="../Preferences/ConfigurationDialog.py" line="934" /> <location filename="../Preferences/ConfigurationDialog.py" line="285" /> <source>PDF Viewer</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="965" /> + <location filename="../Preferences/ConfigurationDialog.py" line="972" /> <location filename="../Preferences/ConfigurationDialog.py" line="292" /> <source>Python Package Management</source> <translation type="unfinished" /> @@ -7724,7 +7725,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="806" /> + <location filename="../Preferences/ConfigurationDialog.py" line="813" /> <location filename="../Preferences/ConfigurationDialog.py" line="684" /> <location filename="../Preferences/ConfigurationDialog.py" line="306" /> <source>Printer</source> @@ -7741,13 +7742,13 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="813" /> + <location filename="../Preferences/ConfigurationDialog.py" line="820" /> <location filename="../Preferences/ConfigurationDialog.py" line="321" /> <source>Security</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="996" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1003" /> <location filename="../Preferences/ConfigurationDialog.py" line="328" /> <source>Shell</source> <translation type="unfinished" /> @@ -7763,7 +7764,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="865" /> + <location filename="../Preferences/ConfigurationDialog.py" line="872" /> <location filename="../Preferences/ConfigurationDialog.py" line="343" /> <source>Tray Starter</source> <translation type="unfinished" /> @@ -7779,7 +7780,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1003" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1010" /> <location filename="../Preferences/ConfigurationDialog.py" line="698" /> <location filename="../Preferences/ConfigurationDialog.py" line="399" /> <location filename="../Preferences/ConfigurationDialog.py" line="364" /> @@ -7814,14 +7815,14 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1010" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1017" /> <location filename="../Preferences/ConfigurationDialog.py" line="712" /> <location filename="../Preferences/ConfigurationDialog.py" line="413" /> <source>Searching</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="848" /> + <location filename="../Preferences/ConfigurationDialog.py" line="855" /> <location filename="../Preferences/ConfigurationDialog.py" line="719" /> <location filename="../Preferences/ConfigurationDialog.py" line="648" /> <location filename="../Preferences/ConfigurationDialog.py" line="420" /> @@ -7829,7 +7830,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1017" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1024" /> <location filename="../Preferences/ConfigurationDialog.py" line="726" /> <location filename="../Preferences/ConfigurationDialog.py" line="427" /> <source>Style</source> @@ -7852,14 +7853,14 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1024" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1031" /> <location filename="../Preferences/ConfigurationDialog.py" line="455" /> <source>Autocompletion</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1045" /> - <location filename="../Preferences/ConfigurationDialog.py" line="1031" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1052" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1038" /> <location filename="../Preferences/ConfigurationDialog.py" line="483" /> <location filename="../Preferences/ConfigurationDialog.py" line="462" /> <source>QScintilla</source> @@ -7873,13 +7874,13 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1038" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1045" /> <location filename="../Preferences/ConfigurationDialog.py" line="476" /> <source>Calltips</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1052" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1059" /> <location filename="../Preferences/ConfigurationDialog.py" line="740" /> <location filename="../Preferences/ConfigurationDialog.py" line="497" /> <source>Highlighters</source> @@ -7892,21 +7893,21 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1059" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1066" /> <location filename="../Preferences/ConfigurationDialog.py" line="754" /> <location filename="../Preferences/ConfigurationDialog.py" line="511" /> <source>Styles</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1066" /> - <location filename="../Preferences/ConfigurationDialog.py" line="761" /> - <location filename="../Preferences/ConfigurationDialog.py" line="518" /> - <source>Keywords</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Preferences/ConfigurationDialog.py" line="1073" /> + <location filename="../Preferences/ConfigurationDialog.py" line="761" /> + <location filename="../Preferences/ConfigurationDialog.py" line="518" /> + <source>Keywords</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1080" /> <location filename="../Preferences/ConfigurationDialog.py" line="768" /> <location filename="../Preferences/ConfigurationDialog.py" line="525" /> <source>Properties</source> @@ -7923,7 +7924,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="820" /> + <location filename="../Preferences/ConfigurationDialog.py" line="827" /> <location filename="../Preferences/ConfigurationDialog.py" line="553" /> <source>Help Documentation</source> <translation type="unfinished" /> @@ -7950,12 +7951,12 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1136" /> - <location filename="../Preferences/ConfigurationDialog.py" line="1097" /> - <location filename="../Preferences/ConfigurationDialog.py" line="989" /> - <location filename="../Preferences/ConfigurationDialog.py" line="951" /> - <location filename="../Preferences/ConfigurationDialog.py" line="920" /> - <location filename="../Preferences/ConfigurationDialog.py" line="889" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1143" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1104" /> + <location filename="../Preferences/ConfigurationDialog.py" line="996" /> + <location filename="../Preferences/ConfigurationDialog.py" line="958" /> + <location filename="../Preferences/ConfigurationDialog.py" line="927" /> + <location filename="../Preferences/ConfigurationDialog.py" line="896" /> <location filename="../Preferences/ConfigurationDialog.py" line="792" /> <location filename="../Preferences/ConfigurationDialog.py" line="677" /> <location filename="../Preferences/ConfigurationDialog.py" line="602" /> @@ -7974,46 +7975,46 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="827" /> + <location filename="../Preferences/ConfigurationDialog.py" line="834" /> <location filename="../Preferences/ConfigurationDialog.py" line="627" /> <source>Appearance</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="834" /> - <location filename="../Preferences/ConfigurationDialog.py" line="634" /> - <source>eric Web Browser</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Preferences/ConfigurationDialog.py" line="841" /> + <location filename="../Preferences/ConfigurationDialog.py" line="634" /> + <source>eric Web Browser</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationDialog.py" line="848" /> <location filename="../Preferences/ConfigurationDialog.py" line="641" /> <source>VirusTotal Interface</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1228" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1235" /> <source>Enter search text...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1303" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1310" /> <source>Preferences</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1309" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1316" /> <source>Please select an entry of the list to display the configuration page.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1392" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1399" /> <source>Configuration Page Error</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1393" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1400" /> <source><p>The configuration page <b>{0}</b> could not be loaded.</p></source> <translation type="unfinished" /> </message> @@ -10564,12 +10565,12 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="1691" /> + <location filename="../Debugger/DebuggerInterfacePython.py" line="1692" /> <source>Debug Protocol Error</source> <translation type="unfinished" /> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="1692" /> + <location filename="../Debugger/DebuggerInterfacePython.py" line="1693" /> <source><p>The response received from the debugger backend could not be decoded. Please report this issue with the received data to the eric bugs email address.</p><p>Error: {0}</p><p>Data:<br/>{1}</p></source> <translation type="unfinished" /> </message> @@ -22546,64 +22547,147 @@ </message> </context> <context> + <name>Fastexport</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="183" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="174" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="168" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="159" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="133" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="113" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="57" /> + <source>Mercurial Fastexport</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="58" /> + <source><p>The output file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="107" /> + <source>Cancel</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="110" /> + <source>%v/%m Changesets</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="116" /> + <source>Exporting repository (time remaining: {0}) ...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="134" /> + <source><p>The repository fastexport process sent an error message.</p><p>{0}</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="160" /> + <source><p>The repository fastexport process finished successfully.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="169" /> + <source><p>The repository fastexport process was cancelled.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="175" /> + <source><p>The repository fastexport process finished with exit code <b>{0}</b>.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="184" /> + <source><p>The repository fastexport process crashed.</p></source> + <translation type="unfinished" /> + </message> + </context> + <context> + <name>FastexportProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="37" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="35" /> + <source>Export to git</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="44" /> + <source>Export the repository as git fast-import stream.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="47" /> + <source><b>Export to git</b><p>This exports the repository as a git fast-import stream.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="79" /> + <source>Fastexport</source> + <translation type="unfinished" /> + </message> + </context> + <context> <name>FeaturePermissionBar</name> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="48" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="50" /> <source>{0} wants to use your position.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="51" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="53" /> <source>{0} wants to use your microphone.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="54" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="56" /> <source>{0} wants to use your camera.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="57" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="59" /> <source>{0} wants to use your microphone and camera.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="60" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="62" /> <source>{0} wants to lock your mouse.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="61" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="63" /> <source>{0} wants to capture video of your screen.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="64" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="66" /> <source>{0} wants to capture audio and video of your screen.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="67" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="69" /> <source>{0} wants to use desktop notifications.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="92" /> - <source>Remember</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="94" /> + <source>Remember</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="96" /> <source>Allow</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="95" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="97" /> <source>Deny</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="120" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="122" /> <source>{0} wants to use an unknown feature.</source> <translation type="unfinished" /> </message> @@ -22611,80 +22695,106 @@ <context> <name>FeaturePermissionsDialog</name> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="161" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="143" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="127" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="109" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="93" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="79" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="65" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="49" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="208" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="190" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="170" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="152" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="136" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="118" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="102" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="88" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="74" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="58" /> <source>Host</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="162" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="144" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="128" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="110" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="94" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="80" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="66" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="50" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="209" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="191" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="171" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="153" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="137" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="119" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="103" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="89" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="75" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="59" /> <source>Permission</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="54" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="63" /> <source>Notifications</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="68" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="77" /> <source>Geolocation</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="82" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="91" /> <source>Microphone</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="96" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="105" /> <source>Camera</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="114" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="123" /> <source>Microphone && Camera</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="130" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="139" /> <source>Mouse Lock</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="148" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="157" /> <source>Desktop Video</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="166" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="175" /> <source>Desktop Audio && Video</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="181" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="195" /> + <source>Clipboard</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="213" /> + <source>Local Fonts</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="296" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="253" /> <source>Allow</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="182" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="297" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="254" /> <source>Deny</source> <translation type="unfinished" /> </message> <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="255" /> + <source>Always Ask</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="256" /> + <source>Invalid</source> + <translation type="unfinished" /> + </message> + <message> <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.ui" line="0" /> <source>HTML5 Feature Permissions</source> <translation type="unfinished" /> @@ -24555,74 +24665,74 @@ <translation type="unfinished" /> </message> <message> - <location filename="../UI/FindFileWidget.py" line="750" /> + <location filename="../UI/FindFileWidget.py" line="749" /> <source>Invalid search expression</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/FindFileWidget.py" line="751" /> + <location filename="../UI/FindFileWidget.py" line="750" /> <source><p>The search expression is not valid.</p><p>Error: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/FindFileWidget.py" line="878" /> + <location filename="../UI/FindFileWidget.py" line="877" /> <source>{0} / {1}</source> <comment>occurrences / files</comment> <translation type="unfinished" /> </message> <message numerus="yes"> - <location filename="../UI/FindFileWidget.py" line="881" /> + <location filename="../UI/FindFileWidget.py" line="880" /> <source>%n occurrence(s)</source> <translation type="unfinished"> <numerusform /> </translation> </message> <message numerus="yes"> - <location filename="../UI/FindFileWidget.py" line="882" /> + <location filename="../UI/FindFileWidget.py" line="881" /> <source>%n file(s)</source> <translation type="unfinished"> <numerusform /> </translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1081" /> - <location filename="../UI/FindFileWidget.py" line="1056" /> - <location filename="../UI/FindFileWidget.py" line="1042" /> + <location filename="../UI/FindFileWidget.py" line="1080" /> + <location filename="../UI/FindFileWidget.py" line="1055" /> + <location filename="../UI/FindFileWidget.py" line="1041" /> <source>Replace in Files</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1043" /> + <location filename="../UI/FindFileWidget.py" line="1042" /> <source><p>Could not read the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1057" /> + <location filename="../UI/FindFileWidget.py" line="1056" /> <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 type="unfinished" /> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1082" /> + <location filename="../UI/FindFileWidget.py" line="1081" /> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1111" /> + <location filename="../UI/FindFileWidget.py" line="1110" /> <source>Open</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1113" /> + <location filename="../UI/FindFileWidget.py" line="1112" /> <source>Copy Path to Clipboard</source> <translation type="unfinished" /> </message> <message> + <location filename="../UI/FindFileWidget.py" line="1116" /> + <source>Select All</source> + <translation type="unfinished" /> + </message> + <message> <location filename="../UI/FindFileWidget.py" line="1117" /> - <source>Select All</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../UI/FindFileWidget.py" line="1118" /> <source>Deselect All</source> <translation type="unfinished" /> </message> @@ -26797,37 +26907,37 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="91" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="94" /> <source>Additional Output</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="110" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="113" /> <source>Process canceled.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="124" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="127" /> <source>Process finished successfully.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="126" /> - <source>Process crashed.</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="129" /> + <source>Process crashed.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="132" /> <source>Process finished with exit code {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="195" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="198" /> <source>Process Generation Error</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="196" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="199" /> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished" /> </message> @@ -35186,456 +35296,456 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="303" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="309" /> <source>Create project repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="304" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="310" /> <source>The project repository could not be created.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="338" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="344" /> <source>Creating Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="359" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="365" /> <source>Initial commit to Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="405" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="411" /> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="516" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="522" /> <source>Commit Changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="517" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="523" /> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="580" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="586" /> <source>Committing changes to Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="679" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="685" /> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="719" /> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="774" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="780" /> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="829" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="835" /> <source>Renaming {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="964" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="970" /> <source>Tagging in the Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1011" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1000" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1017" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006" /> <source>Revert changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1001" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1007" /> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1012" /> - <source>Do you really want to revert all changes of the project?</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1018" /> + <source>Do you really want to revert all changes of the project?</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1024" /> <source>Reverting changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1064" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1070" /> <source>Merging</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1095" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1109" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101" /> <source>Re-Merge</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1102" /> <source>Do you really want to re-merge these files or directories?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1104" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1110" /> <source>Do you really want to re-merge the project?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1114" /> <source>Re-Merging</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1131" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1137" /> <source>Current branch tip</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1314" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1320" /> <source>Mercurial command</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1492" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1498" /> <source>Copying {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1758" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1746" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1764" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1752" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743" /> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1759" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1765" /> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2457" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2446" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2436" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1835" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2455" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844" /> <source>Apply changegroups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1838" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1847" /> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1884" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1893" /> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2027" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2036" /> <source>Marking as 'unresolved'</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2029" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038" /> <source>Marking as 'resolved'</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2051" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060" /> <source>Aborting uncommitted merge</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2084" /> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086" /> - <source>Created new branch <{0}>.</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2095" /> + <source>Created new branch <{0}>.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2104" /> <source>Showing current branch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2184" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193" /> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2200" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209" /> <source>Showing the combined configuration settings</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2224" /> <source>Showing aliases for remote repositories</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2230" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239" /> <source>Recovering from interrupted transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254" /> <source>Identifying project directory</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2291" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2300" /> <source>Create .hgignore file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2292" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301" /> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2395" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2369" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2351" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2404" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2378" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2360" /> <source>Create changegroup</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2353" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362" /> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2370" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2379" /> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2409" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2418" /> <source>Preview changegroup</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2438" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2411" /> - <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2447" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2420" /> + <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2456" /> <source>Shall the working directory be updated?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2479" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2488" /> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2501" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2510" /> <source>Mercurial Bisect ({0})</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2527" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2536" /> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2576" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2557" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2585" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2566" /> <source>Backing out changeset</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2558" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2567" /> <source>No revision given. Aborting...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2587" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2602" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2596" /> <source>Rollback last transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2588" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2597" /> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2657" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2666" /> <source>Import Patch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2707" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2716" /> <source>Export Patches</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2749" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2758" /> <source>Change Phase</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2804" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813" /> <source>Copy Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2843" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2852" /> <source>Copy Changesets (Continue)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2853" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2862" /> <source>Copy Changesets (Stop)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2863" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2872" /> <source>Copy Changesets (Abort)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2887" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2896" /> <source>Create Unversioned Archive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2902" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2911" /> <source>Delete All Backups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2903" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2912" /> <source><p>Do you really want to delete all backup bundles stored in the backup area?<br/><b>{0}</b></p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2994" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2974" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2963" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2983" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2972" /> <source>Add Sub-repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3033" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2964" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3042" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2973" /> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2975" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2984" /> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3051" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3060" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3004" /> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3050" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3032" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3018" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3059" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3027" /> <source>Remove Sub-repositories</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3019" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3028" /> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3296" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3138" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3147" /> <source>Mercurial Command Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3139" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3148" /> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3297" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3321" /> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3420" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3444" /> <source>Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3437" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3461" /> <source>Delete Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3438" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3462" /> <source>Select the bookmark to be deleted:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3449" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3473" /> <source>Delete Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3476" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3500" /> <source>Rename Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3518" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3542" /> <source>Move Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3600" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3624" /> <source>Pull Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3601" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3625" /> <source>Select the bookmark to be pulled:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3613" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3637" /> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3641" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3665" /> <source>Push Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3642" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3666" /> <source>Select the bookmark to be push:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3657" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3681" /> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished" /> </message> @@ -36478,42 +36588,42 @@ <context> <name>HgClient</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="98" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="100" /> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="147" /> - <source>Did not receive the 'hello' message.</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="149" /> + <source>Did not receive the 'hello' message.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="151" /> <source>Received data on unexpected channel.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="154" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="156" /> <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="159" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="161" /> <source>'capabilities' message did not contain any capability.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="168" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="170" /> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="173" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="175" /> <source>'encoding' message did not contain any encoding.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="385" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="387" /> <source>For message see output dialog.</source> <translation type="unfinished" /> </message> @@ -36874,6 +36984,11 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="0" /> + <source>%v/%m</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="0" /> <source>Errors</source> <translation type="unfinished" /> </message> @@ -36917,6 +37032,11 @@ <source>Alt+P</source> <translation type="unfinished" /> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="211" /> + <source>Time remaining: {0}</source> + <translation type="unfinished" /> + </message> </context> <context> <name>HgDiffDialog</name> @@ -37096,6 +37216,69 @@ </message> </context> <context> + <name>HgFastexportConfigDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>fastexport Configuration</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the path of the file for the exported marks.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the path of the output file.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Revisions:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the path of the file containing already exported marks.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Author Map:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Import Marks:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Export Marks:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Output File:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the revisions, tags or branches to be exported (separated by comma).</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the path of the author map file.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.py" line="42" /> + <source>Text Files (*.txt);;All Files (*)</source> + <translation type="unfinished" /> + </message> + </context> + <context> <name>HgGpgSignDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="0" /> @@ -37907,7 +38090,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3049" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3063" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298" /> <source>Select Branches</source> <translation type="unfinished" /> @@ -37948,7 +38131,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2218" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2227" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> <source>Copy Changesets</source> <translation type="unfinished" /> @@ -38005,8 +38188,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2312" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2295" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2321" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2304" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="387" /> <source>Switch</source> <translation type="unfinished" /> @@ -38037,263 +38220,270 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2430" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1622" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="415" /> - <source>Pull Changes</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="418" /> - <source>Pull changes from a remote repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="420" /> + <source>Pull Selected Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="419" /> + <source>Pull selected changes from a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="423" /> + <source>Pull All Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="427" /> + <source>Pull all changes from a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="430" /> <source>Pull Large Files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="422" /> - <source>Pull large files for selected revisions</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="428" /> - <source>Push Selected Changes</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="432" /> - <source>Push changes of the selected changeset and its ancestors to a remote repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="439" /> - <source>Push All Changes</source> + <source>Pull large files for selected revisions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="438" /> + <source>Push Selected Changes</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="442" /> - <source>Push all changes to a remote repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="448" /> - <source>Create Changegroup</source> + <source>Push changes of the selected changeset and its ancestors to a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="449" /> + <source>Push All Changes</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="452" /> + <source>Push all changes to a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="458" /> + <source>Create Changegroup</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="462" /> <source>Create a changegroup file containing the selected changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="455" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="465" /> <source><b>Create Changegroup</b> <p>This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2569" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="468" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2583" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="478" /> <source>Apply Changegroup</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="472" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="482" /> <source>Apply the currently viewed changegroup file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="489" /> <source>Sign Revisions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="483" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="493" /> <source>Add a signature for the selected revisions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="487" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="497" /> <source>Verify Signatures</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="491" /> - <source>Verify all signatures there may be for the selected revision</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2476" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498" /> - <source>Strip Changesets</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="501" /> + <source>Verify all signatures there may be for the selected revision</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="508" /> + <source>Strip Changesets</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="511" /> <source>Strip changesets from a repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="506" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="516" /> <source>Select All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="509" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="519" /> <source>Deselect All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="958" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="934" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="911" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="885" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="968" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="944" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="921" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="895" /> <source>Mercurial Error</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1266" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1276" /> <source>{0} (large file)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1532" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1542" /> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1543" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1553" /> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1701" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1620" /> - <source>Pull Selected Changes</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2570" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2477" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2431" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2313" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2219" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2584" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2491" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2322" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2228" /> <source>The project should be reread. Do this now?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2296" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2305" /> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2341" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2350" /> <source>Define Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2342" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2351" /> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2371" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2380" /> <source>Move Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2372" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2381" /> <source>Select the bookmark to be moved to changeset '{0}':</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2444" /> + <source>Pull Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2727" /> <source>Find Commit</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2714" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728" /> <source>'{0}' was not found.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2774" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2788" /> <source>Generating differences ...</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2775" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2789" /> <source>Differences</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2794" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2808" /> <source>No differences available. Get some more log entries.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2796" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2810" /> <source>No differences available.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2807" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2821" /> <source>Differences to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2823" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2837" /> <source>Diff to Parent {0}{1}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2846" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2860" /> <source>There is no difference.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2999" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2983" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2965" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3013" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2997" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2979" /> <source>Save Diff</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2967" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2981" /> <source>Patch Files (*.diff)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2984" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2998" /> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3000" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3014" /> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3031" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3045" /> <source>closed</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3032" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3046" /> <source>inactive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3041" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3055" /> <source>{0} ({1})</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3050" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3064" /> <source>Select the branches to be shown (none for 'All'):</source> <translation type="unfinished" /> </message> @@ -38802,208 +38992,213 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="282" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="309" /> + <source>Other Functions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="335" /> <source>Extensions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="718" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="604" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="556" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="451" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="308" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="774" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="659" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="611" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="505" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="361" /> <source>Version Control</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="734" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="620" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="467" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="324" /> - <source>Commit changes to repository...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="742" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="628" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="475" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="332" /> - <source>Add to repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="748" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="481" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="338" /> - <source>Remove from repository (and disk)</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1012" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="999" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="487" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="344" /> - <source>Remove from repository only</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="639" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="349" /> - <source>Copy</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="641" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="351" /> - <source>Move</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="646" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="356" /> - <source>Show log browser</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="755" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="653" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="494" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="363" /> - <source>Show status</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="762" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="660" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="501" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="370" /> - <source>Show differences</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="376" /> - <source>Show differences side-by-side</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="768" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="666" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="507" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="382" /> - <source>Show differences (extended)</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="388" /> - <source>Show differences side-by-side (extended)</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="394" /> - <source>Show annotated file</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="398" /> - <source>Show annotated file with skip list</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="402" /> - <source>Create skip list file</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="775" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="673" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="514" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="408" /> - <source>Revert changes</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="779" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="677" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="518" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="412" /> - <source>Conflicts resolved</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="781" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="679" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="520" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="414" /> - <source>Conflicts unresolved</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="783" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="681" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="522" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="416" /> - <source>Re-Merge</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="787" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="685" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="571" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="526" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="420" /> - <source>Select all local file entries</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="790" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="688" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="574" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="529" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="423" /> - <source>Select all versioned file entries</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="793" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="691" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="675" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="521" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="377" /> + <source>Commit changes to repository...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="799" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="684" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="530" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="386" /> + <source>Add to repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="805" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="690" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="536" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="392" /> + <source>Remove from repository (and disk)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1069" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1056" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="542" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="398" /> + <source>Remove from repository only</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="695" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="403" /> + <source>Copy</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="697" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="405" /> + <source>Move</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="702" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="410" /> + <source>Show log browser</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="812" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="709" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="549" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="417" /> + <source>Show status</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="819" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="716" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="556" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="424" /> + <source>Show differences</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="430" /> + <source>Show differences side-by-side</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="825" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="722" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="562" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="436" /> + <source>Show differences (extended)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="442" /> + <source>Show differences side-by-side (extended)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="448" /> + <source>Show annotated file</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="452" /> + <source>Show annotated file with skip list</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="456" /> + <source>Create skip list file</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="832" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="729" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="569" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="462" /> + <source>Revert changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="836" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="733" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="573" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="466" /> + <source>Conflicts resolved</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="735" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="575" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="468" /> + <source>Conflicts unresolved</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="840" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="737" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="577" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="532" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="426" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="470" /> + <source>Re-Merge</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="844" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="741" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="581" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="474" /> + <source>Select all local file entries</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="847" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="744" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="629" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="584" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="477" /> + <source>Select all versioned file entries</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="850" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="747" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="632" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="587" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="480" /> <source>Select all local directory entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="797" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="695" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="581" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="536" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="430" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="854" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="751" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="591" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="484" /> <source>Select all versioned directory entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="801" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="699" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="585" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="540" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="434" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="858" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="755" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="640" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="595" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="488" /> <source>Configure...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="916" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="973" /> <source>Create {0} file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="917" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="974" /> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1013" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1000" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1070" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1057" /> <source>Do you really want to remove these files from the repository?</source> <translation type="unfinished" /> </message> @@ -39011,1513 +39206,1518 @@ <context> <name>HgProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="126" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="135" /> <source>New from repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="128" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="137" /> <source>&New from repository...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="135" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="144" /> <source>Create (clone) a new project from a Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="138" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="147" /> <source><b>New from repository</b><p>This creates (clones) a new local project from a Mercurial repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="150" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="148" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="159" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="157" /> <source>Show incoming log</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="156" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="165" /> <source>Show the log of incoming changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="158" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="167" /> <source><b>Show incoming log</b><p>This shows the log of changes coming into the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="170" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="168" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="179" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="177" /> <source>Pull changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="176" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="185" /> <source>Pull changes from a remote repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="178" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="187" /> <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="188" /> - <source>Update from repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="190" /> - <source>&Update from repository</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="197" /> + <source>Update from repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="199" /> + <source>&Update from repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="206" /> <source>Update the local project from the Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="200" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="209" /> <source><b>Update from repository</b><p>This updates the local project from the Mercurial repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="210" /> - <source>Commit changes to repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="212" /> - <source>&Commit changes to repository...</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="219" /> + <source>Commit changes to repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="221" /> + <source>&Commit changes to repository...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="228" /> <source>Commit changes to the local project to the Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="231" /> <source><b>Commit changes to repository</b><p>This commits changes to the local project to the Mercurial repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="234" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="232" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="243" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="241" /> <source>Show outgoing log</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="240" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="249" /> <source>Show the log of outgoing changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="242" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251" /> <source><b>Show outgoing log</b><p>This shows the log of changes outgoing out of the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="254" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="252" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261" /> <source>Push changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="260" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="269" /> <source>Push changes to a remote repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="262" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271" /> <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="274" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="272" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281" /> <source>Push changes (force)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="290" /> <source>Push changes to a remote repository with force option</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="284" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293" /> <source><b>Push changes (force)</b><p>This pushes changes from the local repository to a remote repository using the 'force' option.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="294" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="303" /> <source>Export from repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="296" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="305" /> <source>&Export from repository...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="302" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="311" /> <source>Export a project from the repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="313" /> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="313" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="324" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322" /> <source>Show log browser</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="331" /> <source>Show a dialog to browse the log of the local project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="334" /> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="336" /> - <source>Show differences</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="338" /> - <source>Show &difference</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="345" /> + <source>Show differences</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347" /> + <source>Show &difference</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="354" /> <source>Show the difference of the local project to the repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="357" /> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="360" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="358" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="369" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="367" /> <source>Show differences (extended)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="367" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376" /> <source>Show the difference of revisions of the project to the repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="370" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379" /> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="380" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389" /> <source>Show status</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="391" /> <source>Show &status...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="397" /> <source>Show the status of the local project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390" /> - <source><b>Show status</b><p>This shows the status of the local project.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="399" /> - <source>Show Summary</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="401" /> - <source>Show summary...</source> + <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408" /> + <source>Show Summary</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="410" /> + <source>Show summary...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="417" /> <source>Show summary information of the working directory status</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="411" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420" /> <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="430" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="430" /> <source>Show heads</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="432" /> <source>Show the heads of the repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="425" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="434" /> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="434" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="443" /> <source>Show parents</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="441" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450" /> <source>Show the parents of the repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="443" /> - <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="452" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="452" /> + <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461" /> <source>Show tip</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="463" /> <source>Show the tip of the repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="456" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="465" /> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462" /> - <source>Revert changes</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464" /> - <source>Re&vert changes</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471" /> + <source>Revert changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="473" /> + <source>Re&vert changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="480" /> <source>Revert all changes made to the local project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483" /> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2110" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2129" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492" /> <source>Merge</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="485" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494" /> <source>Mer&ge changes...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501" /> <source>Merge changes of a revision into the local project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="495" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="504" /> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="506" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="515" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514" /> <source>Commit Merge</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521" /> <source>Commit all the merged changes.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="523" /> <source><b>Commit a merge</b><p>This commits a merge working directory</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="523" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="533" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="532" /> <source>Abort Merge</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="531" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540" /> <source>Abort an uncommitted merge and lose all changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="543" /> <source><b>Abort uncommitted merge</b><p>This aborts an uncommitted merge causing all changes to be lost.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="546" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="544" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="553" /> <source>Re-Merge</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="553" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="562" /> <source>Re-Merge all conflicting, unresolved files of the project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="556" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="565" /> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="575" /> <source>Show conflicts</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="576" /> <source>Show conflicts...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="583" /> <source>Show a dialog listing all files with conflicts</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586" /> <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596" /> <source>Conflicts resolved</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="597" /> <source>Con&flicts resolved</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604" /> <source>Mark all conflicts of the local project as resolved</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="607" /> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617" /> <source>Conflicts unresolved</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625" /> <source>Mark all conflicts of the local project as unresolved</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628" /> <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638" /> <source>Tag in repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640" /> <source>&Tag in repository...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="637" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646" /> <source>Tag the local project in the repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="639" /> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648" /> - <source>List tags</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="649" /> - <source>List tags...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655" /> - <source>List tags of the project</source> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657" /> - <source><b>List tags</b><p>This lists the tags of the project.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663" /> - <source>List branches</source> + <source>List tags</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="658" /> + <source>List tags...</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="664" /> - <source>List branches...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670" /> - <source>List branches of the project</source> + <source>List tags of the project</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666" /> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672" /> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <source>List branches</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673" /> + <source>List branches...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="679" /> + <source>List branches of the project</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681" /> - <source>Create branch</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="683" /> - <source>Create &branch...</source> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="690" /> + <source>Create branch</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692" /> + <source>Create &branch...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699" /> <source>Create a new branch for the local project in the repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="693" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="702" /> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712" /> <source>Push new branch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721" /> <source>Push the current branch of the local project as a new named branch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="717" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726" /> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="738" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736" /> <source>Close branch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="745" /> <source>Close the current branch of the local project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748" /> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="758" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757" /> <source>Show current branch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="756" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765" /> <source>Show the current branch of the project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="759" /> - <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768" /> - <source>Switch</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770" /> - <source>S&witch...</source> + <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777" /> + <source>Switch</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="779" /> + <source>S&witch...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786" /> <source>Switch the working directory to another revision</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="780" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="789" /> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799" /> <source>Cleanup</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799" /> <source>Cleanu&p</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="792" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801" /> <source>Cleanup the local project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794" /> - <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="803" /> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="812" /> <source>Execute command</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813" /> <source>E&xecute command...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="811" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="820" /> <source>Execute an arbitrary Mercurial command</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="814" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="823" /> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="824" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833" /> <source>Configure</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="834" /> <source>Configure...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="841" /> <source>Show the configuration dialog with the Mercurial page selected</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="835" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="844" /> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854" /> <source>Edit user configuration</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855" /> <source>Edit user configuration...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="862" /> <source>Show an editor to edit the user configuration file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="856" /> - <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865" /> + <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874" /> <source>Edit repository configuration</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875" /> <source>Edit repository configuration...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="873" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882" /> <source>Show an editor to edit the repository configuration file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="876" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885" /> <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895" /> <source>Show combined configuration settings</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896" /> <source>Show combined configuration settings...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="894" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903" /> <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909" /> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919" /> <source>Show paths</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="911" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="920" /> <source>Show paths...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="918" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="927" /> <source>Show the aliases for remote repositories</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="921" /> - <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930" /> - <source>Verify repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="931" /> - <source>Verify repository...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937" /> - <source>Verify the integrity of the repository</source> + <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="939" /> - <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> + <source>Verify repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="940" /> + <source>Verify repository...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="946" /> + <source>Verify the integrity of the repository</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="948" /> + <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="957" /> <source>Recover</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="948" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="957" /> <source>Recover...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="951" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960" /> <source>Recover from an interrupted transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="954" /> - <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="963" /> - <source>Identify</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964" /> - <source>Identify...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="970" /> - <source>Identify the project directory</source> + <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="972" /> + <source>Identify</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973" /> + <source>Identify...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979" /> + <source>Identify the project directory</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="981" /> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="981" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="990" /> <source>Create .hgignore</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="989" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="998" /> <source>Create a .hgignore file with default values</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="992" /> - <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001" /> - <source>Create changegroup</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1003" /> - <source>Create changegroup...</source> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010" /> + <source>Create changegroup</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1012" /> + <source>Create changegroup...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1019" /> <source>Create changegroup file collecting changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1013" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1022" /> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1023" /> - <source>Preview changegroup</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1025" /> - <source>Preview changegroup...</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032" /> + <source>Preview changegroup</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1034" /> + <source>Preview changegroup...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041" /> <source>Preview a changegroup file containing a collection of changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044" /> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2244" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1045" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2263" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054" /> <source>Apply changegroups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1047" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056" /> <source>Apply changegroups...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063" /> <source>Apply one or several changegroup files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066" /> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1067" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076" /> <source>Mark as "good"</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1077" /> <source>Mark as "good"...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1075" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1084" /> <source>Mark a selectable changeset as good</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1078" /> - <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1087" /> - <source>Mark as "bad"</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088" /> - <source>Mark as "bad"...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1094" /> - <source>Mark a selectable changeset as bad</source> + <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1096" /> - <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105" /> - <source>Skip</source> + <source>Mark as "bad"</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1097" /> + <source>Mark as "bad"...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103" /> + <source>Mark a selectable changeset as bad</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105" /> + <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1114" /> + <source>Skip</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1114" /> <source>Skip...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1107" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116" /> <source>Skip a selectable changeset</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1109" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118" /> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1115" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1115" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124" /> <source>Reset</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1117" /> - <source>Reset the bisect search data</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119" /> - <source><b>Reset</b><p>This resets the bisect search data.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1126" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1125" /> + <source>Reset the bisect search data</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128" /> + <source><b>Reset</b><p>This resets the bisect search data.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1135" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134" /> <source>Back out changeset</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1142" /> <source>Back out changes of an earlier changeset</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1145" /> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1145" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1155" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154" /> <source>Rollback last transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1152" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161" /> <source>Rollback the last transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1163" /> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1176" /> - <source>Serve project repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1177" /> - <source>Serve project repository...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183" /> - <source>Serve the project repository</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185" /> + <source>Serve project repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1186" /> + <source>Serve project repository...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1192" /> + <source>Serve the project repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1194" /> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2301" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1194" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1203" /> <source>Import Patch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1196" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1205" /> <source>Import Patch...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1202" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211" /> <source>Import a patch from a patch file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1204" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1213" /> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1214" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1223" /> <source>Export Patches</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1225" /> <source>Export Patches...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1222" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1231" /> <source>Export revisions to patch files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1224" /> - <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233" /> - <source>Change Phase</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234" /> - <source>Change Phase...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1240" /> - <source>Change the phase of revisions</source> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1242" /> + <source>Change Phase</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1243" /> + <source>Change Phase...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1249" /> + <source>Change the phase of revisions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251" /> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2343" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1804" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1253" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2362" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1822" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1262" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1260" /> <source>Copy Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1259" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1268" /> <source>Copies changesets from another branch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1261" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270" /> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1273" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1272" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1282" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1281" /> <source>Continue Copying Session</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1280" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1289" /> <source>Continue the last copying session after conflicts were resolved</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1283" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1292" /> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1294" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1293" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1303" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1302" /> <source>Stop Copying Session</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1310" /> <source>Stop the interrupted copying session</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1304" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1313" /> <source><b>Stop Copying Session</b><p>This stops the interrupted copying session.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1314" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1313" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1323" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1322" /> <source>Abort Copying Session</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1321" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330" /> <source>Abort the interrupted copying session and rollback</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1324" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1333" /> <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1334" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1343" /> <source>Add</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1336" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1345" /> <source>Add...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1342" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1351" /> <source>Add a sub-repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1344" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1353" /> <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1350" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1359" /> <source>Remove</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1352" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1361" /> <source>Remove...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1358" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367" /> <source>Remove sub-repositories</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1360" /> - <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1369" /> - <source>Create unversioned archive</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1371" /> - <source>Create unversioned archive...</source> + <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1378" /> + <source>Create unversioned archive</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1380" /> + <source>Create unversioned archive...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1387" /> <source>Create an unversioned archive from the repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1381" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1390" /> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1391" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1400" /> <source>List bookmarks</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1393" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1402" /> <source>List bookmarks...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1399" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1408" /> <source>List bookmarks of the project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1401" /> - <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1410" /> - <source>Define bookmark</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1412" /> - <source>Define bookmark...</source> + <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1419" /> + <source>Define bookmark</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1421" /> + <source>Define bookmark...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1428" /> <source>Define a bookmark for the project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1422" /> - <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1431" /> - <source>Delete bookmark</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1433" /> - <source>Delete bookmark...</source> + <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1440" /> + <source>Delete bookmark</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1442" /> + <source>Delete bookmark...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1449" /> <source>Delete a bookmark of the project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1443" /> - <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1452" /> - <source>Rename bookmark</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1454" /> - <source>Rename bookmark...</source> + <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1461" /> + <source>Rename bookmark</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1463" /> + <source>Rename bookmark...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1470" /> <source>Rename a bookmark of the project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1464" /> - <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1473" /> + <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1482" /> <source>Move bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1475" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1484" /> <source>Move bookmark...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1481" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1490" /> <source>Move a bookmark of the project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1483" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1492" /> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1495" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1493" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1504" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1502" /> <source>Show incoming bookmarks</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1502" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1511" /> <source>Show a list of incoming bookmarks</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1505" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1514" /> <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1517" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1515" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1526" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1524" /> <source>Pull bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1524" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1533" /> <source>Pull a bookmark from a remote repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1527" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1536" /> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1539" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1537" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1548" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1546" /> <source>Pull current bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1546" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1555" /> <source>Pull the current bookmark from a remote repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1549" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1558" /> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1560" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1558" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1569" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1567" /> <source>Show outgoing bookmarks</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1567" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1576" /> <source>Show a list of outgoing bookmarks</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1570" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1579" /> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1582" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1580" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1591" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1589" /> <source>Push bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1589" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1598" /> <source>Push a bookmark to a remote repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1592" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1601" /> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1604" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1602" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1613" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1611" /> <source>Push current bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1611" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1620" /> <source>Push the current bookmark to a remote repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1614" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1623" /> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1626" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1624" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1635" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1633" /> <source>Push all bookmarks</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1633" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1642" /> <source>Push all bookmarks to a remote repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1636" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1645" /> <source><b>Push all bookmarks</b><p>This pushes all bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1647" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1645" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1656" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1654" /> <source>Delete all backups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1654" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1663" /> <source>Delete all backup bundles stored in the backup area</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1657" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1666" /> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1699" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1708" /> <source>Administration</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1724" /> - <source>Specials</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1733" /> + <source>Specials</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1742" /> <source>Changegroup Management</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1740" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1749" /> <source>Patch Management</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1746" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1755" /> <source>Bisect</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1754" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1763" /> <source>Tags</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1761" /> - <source>Branches</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1770" /> + <source>Branches</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1779" /> <source>Bookmarks</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1791" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1800" /> + <source>Other Functions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1809" /> <source>Extensions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1813" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1831" /> <source>Sub-Repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1818" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1836" /> <source>Merge Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1903" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1901" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1922" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1920" /> <source>Mercurial</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2054" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2073" /> <source>Pull</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2391" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2375" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2360" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2344" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2323" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2302" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2245" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2055" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2410" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2394" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2379" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2363" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2342" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2321" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2264" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2074" /> <source>The project should be reread. Do this now?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2322" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2341" /> <source>Revert Changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2359" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2378" /> <source>Copy Changesets (Continue)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2374" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2393" /> <source>Copy Changesets (Stop)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2390" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2409" /> <source>Copy Changesets (Abort)</source> <translation type="unfinished" /> </message> @@ -40525,7 +40725,7 @@ <context> <name>HgPurgeListDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/HgPurgeListDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/HgPurgeListDialog.ui" line="0" /> <source>Purge List</source> <translation type="unfinished" /> </message> @@ -41695,101 +41895,101 @@ <context> <name>HgShelveBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Mercurial Shelve Browser</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Name</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Age</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Message</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Statistics</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>File</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Lines added</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Lines deleted</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Errors</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source><b>Mercurial shelve errors</b><p>This shows possible error messages of the hg shelve command.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="58" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="58" /> <source>&Refresh</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="60" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="60" /> <source>Press to refresh the list of shelves</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="69" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="69" /> <source>Restore selected shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="72" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="72" /> <source>Delete selected shelves</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="75" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="75" /> <source>Delete all shelves</source> <translation type="unfinished" /> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="290" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="290" /> <source>%n file(s) changed</source> <translation type="unfinished"> <numerusform /> </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="292" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="292" /> <source>%n line(s) inserted</source> <translation type="unfinished"> <numerusform /> </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="295" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="295" /> <source>%n line(s) deleted</source> <translation type="unfinished"> <numerusform /> @@ -41799,57 +41999,57 @@ <context> <name>HgShelveDataDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Name:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Enter a name for the shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Date, Time:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Enter the commit date and time for the shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>yyyy-MM-dd HH:mm</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Message:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Enter a message for the shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Mark new/missing files as added/removed</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Select to shelve, but keep the changes in the working directory</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Shelve, but keep changes</source> <translation type="unfinished" /> </message> @@ -41857,7 +42057,7 @@ <context> <name>HgShelvesSelectionDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelvesSelectionDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelvesSelectionDialog.ui" line="0" /> <source>Mercurial Shelve Selection</source> <translation type="unfinished" /> </message> @@ -42158,129 +42358,6 @@ </message> </context> <context> - <name>HgStripDialog</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Strip Changesets</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>&Revision</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to specify a revision by number</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Number</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enter a revision number</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to specify a revision by changeset id</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Id:</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enter a changeset id</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to specify a revision by a tag</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Tag:</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enter a tag name</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to specify a revision by a branch</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Branch:</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enter a branch name</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Expression:</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enter a revision set expression</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Bookmark:</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enter a bookmark name</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to enforce removal of changesets</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enforce Operation</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to not create backup bundles</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>No Backup</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to keep the current working directory state</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Keep Working Directory</source> - <translation type="unfinished" /> - </message> - </context> - <context> <name>HgSummaryDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.ui" line="0" /> @@ -42774,29 +42851,118 @@ </message> </context> <context> + <name>HgUncommitDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Undo Local Commit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Commit Message</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Enter the log message.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source><b>Log Message</b> +<p>Enter the log message for the uncommit action.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Recent commit messages</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Select a recent commit message to use</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Select to allow an empty commit after undoing it.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Allow empty commit after undoing commit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Select to allow undoing the commit with outstanding changes.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Allow undoing commit with outstanding changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Author</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Enter author name to override the configured user:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Enter an author name in order to override the configured one</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Select to give date and time information</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Date and Time</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Date/Time:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Enter the date and time to be used</source> + <translation type="unfinished" /> + </message> + </context> + <context> <name>HgUnshelveDataDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Mercurial Unshelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Name:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Enter the name of the shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Select to keep the shelved change</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Keep shelved change</source> <translation type="unfinished" /> </message> @@ -42866,22 +43032,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> @@ -42897,52 +43063,42 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the Purge 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>Purge</source> + <source>Histedit</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the queues extension</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Queues</source> + <source>Select to activate the GPG 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>GPG</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Rebase</source> + <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 shelve extension</source> + <source>Fastexport</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Shelve</source> + <source>Select to activate the uncommit extension</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the strip extension</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Strip</source> + <source>Uncommit</source> <translation type="unfinished" /> </message> <message> @@ -43162,32 +43318,32 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="527" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="474" /> <source>Delete Host Fingerprint</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="528" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="475" /> <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="644" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="591" /> <source>Delete Host Minimum Protocol</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="645" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="592" /> <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="708" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="655" /> <source>Edit User Configuration</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="709" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="656" /> <source>You will loose all changes made in this dialog. Shall the data be saved first?</source> <translation type="unfinished" /> </message> @@ -43266,17 +43422,17 @@ <context> <name>HgUtilities</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="130" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="132" /> <source>The hg process finished with the exit code {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="134" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="136" /> <source>The hg process did not finish within 30s.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="138" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="140" /> <source>Could not start the hg executable.</source> <translation type="unfinished" /> </message> @@ -50572,13 +50728,13 @@ <name>Lexers</name> <message> <location filename="../QScintilla/Lexers/__init__.py" line="412" /> - <location filename="../Preferences/__init__.py" line="599" /> + <location filename="../Preferences/__init__.py" line="598" /> <source>Python Files (*.py *.py3)</source> <translation type="unfinished" /> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="505" /> - <location filename="../Preferences/__init__.py" line="602" /> + <location filename="../Preferences/__init__.py" line="601" /> <source>Python3 Files (*.py)</source> <translation type="unfinished" /> </message> @@ -52417,8 +52573,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> @@ -53776,7 +53932,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> @@ -59973,74 +60129,12 @@ </message> <message> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to install the selected package</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to install the selected package to the user site</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to show details for the selected entry</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Toggle to show or hide the search window</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Package</source> + <source>Press to refresh the lists</source> <translation type="unfinished" /> </message> <message> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Enter the search term for the package name</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Enter search term</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to start the search</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to search for more packages</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Version</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Released</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Description</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to refresh the lists</source> + <source>Press to install a package.</source> <translation type="unfinished" /> </message> <message> @@ -60060,6 +60154,17 @@ </message> <message> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Press to show details for the selected entry</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Press to remove leftovers of an upgrade or uninstall run.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> <source>Select to show only locally-installed packages</source> <translation type="unfinished" /> </message> @@ -60103,6 +60208,13 @@ <message> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Package</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> <source>Installed</source> <translation type="unfinished" /> </message> @@ -60197,315 +60309,315 @@ <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="199" /> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Search Package:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Enter package name to search for.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Press to open a web browser for searching.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="83" /> <source>pip Menu</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="233" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="113" /> <source>Author:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="234" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="114" /> <source>Author Email:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="235" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="115" /> <source>Classifiers:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="236" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="116" /> <source>Entry Points:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="237" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="117" /> <source>Files:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="238" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="118" /> <source>Homepage:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="239" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="119" /> <source>Installer:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="240" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="120" /> <source>License:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="241" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="121" /> <source>Location:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="242" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="122" /> <source>Metadata Version:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="243" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="123" /> <source>Name:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="244" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="124" /> <source>Project URLs:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="245" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="125" /> <source>Requires:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="246" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="126" /> <source>Required By:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="247" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="127" /> <source>Summary:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="248" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="128" /> <source>Version:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="450" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="335" /> <source>Getting installed packages...</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="478" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="363" /> <source>Getting outdated packages...</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1231" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1051" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1038" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1002" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="735" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="729" /> + <source>Cleanup Environment</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="730" /> + <source>The environment cleanup was successful.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="736" /> + <source>Some leftover package directories could not been removed. Delete them manually.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="834" /> <source>Search PyPI</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1003" /> - <source><p>Received an error while searching for <b>{0}</b>.</p><p>Error: {1}</p></source> - <translation type="unfinished" /> - </message> - <message numerus="yes"> - <location filename="../PipInterface/PipPackagesWidget.py" line="1018" /> - <source>%n package(s) found.</source> - <translation type="unfinished"> - <numerusform /> - </translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1025" /> - <source>Showing first {0} packages found.</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1044" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1039" /> - <source><p>There were no results for <b>{0}</b>.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1052" /> - <source><p>There were no more results for <b>{0}</b>.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1232" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="835" /> <source><p>No package details info for <b>{0}</b> available.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1251" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="854" /> <source>Pip</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1253" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="856" /> <source>Install Pip</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1256" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="859" /> <source>Install Pip to User-Site</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1259" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="862" /> <source>Repair Pip</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1266" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="869" /> <source>Install</source> <translation type="unfinished" /> </message> <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1048" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="871" /> + <source>Install Packages</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="874" /> + <source>Install Local Package</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="877" /> + <source>Re-Install Selected Packages</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="884" /> + <source>Requirements/Constraints</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="886" /> + <source>Install Requirements</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="889" /> + <source>Uninstall Requirements</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="892" /> + <source>Generate Requirements...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="896" /> + <source>Install from 'pyproject.toml'</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="900" /> + <source>Uninstall from 'pyproject.toml'</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="905" /> + <source>Generate Constraints...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="912" /> + <source>Cache</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="914" /> + <source>Show Cache Info...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="917" /> + <source>Show Cached Files...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="920" /> + <source>Remove Cached Files...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="923" /> + <source>Purge Cache...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="940" /> + <source>Show Licenses...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="944" /> + <source>Check Vulnerabilities</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="948" /> + <source>Update Vulnerability Database</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="952" /> + <source>Create SBOM file</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="959" /> + <source>Edit User Configuration...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="962" /> + <source>Edit Environment Configuration...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="967" /> + <source>Configure...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1211" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1198" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1187" /> + <source>Edit Configuration</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1212" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1199" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1188" /> + <source>No valid configuration path determined. Aborting</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1421" /> + <source>{0} {1}</source> + <comment>package name, package version</comment> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1442" /> + <source>Affected Version:</source> + <translation type="unfinished" /> + </message> + <message> <location filename="../PipInterface/PipPackagesWidget.py" line="1445" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1268" /> - <source>Install Packages</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1271" /> - <source>Install Local Package</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1274" /> - <source>Re-Install Selected Packages</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1281" /> - <source>Requirements/Constraints</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1283" /> - <source>Install Requirements</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1286" /> - <source>Uninstall Requirements</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1289" /> - <source>Generate Requirements...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1293" /> - <source>Install from 'pyproject.toml'</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1297" /> - <source>Uninstall from 'pyproject.toml'</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1302" /> - <source>Generate Constraints...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1309" /> - <source>Cache</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1311" /> - <source>Show Cache Info...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1314" /> - <source>Show Cached Files...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1317" /> - <source>Remove Cached Files...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1320" /> - <source>Purge Cache...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1337" /> - <source>Show Licenses...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1341" /> - <source>Check Vulnerabilities</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1345" /> - <source>Update Vulnerability Database</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1349" /> - <source>Create SBOM file</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1356" /> - <source>Edit User Configuration...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1359" /> - <source>Edit Environment Configuration...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1364" /> - <source>Configure...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1608" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1595" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1584" /> - <source>Edit Configuration</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1609" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1596" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1585" /> - <source>No valid configuration path determined. Aborting</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1818" /> - <source>{0} {1}</source> - <comment>package name, package version</comment> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1839" /> - <source>Affected Version:</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1842" /> <source>Advisory:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1977" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1952" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1580" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1555" /> <source>unknown</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1974" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1577" /> <source>any</source> <translation type="unfinished" /> </message> @@ -61341,64 +61453,69 @@ <name>PluginRepositoryWidget</name> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="124" /> - <source>Stable</source> + <source>Obsolete</source> <translation type="unfinished" /> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="125" /> - <source>Unstable</source> + <source>Stable</source> <translation type="unfinished" /> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="126" /> - <source>Obsolete</source> + <source>Unknown</source> <translation type="unfinished" /> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="127" /> - <source>Unknown</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="179" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="139" /> - <source>Update</source> + <source>Unstable</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="128" /> + <source>Upgrade Available</source> <translation type="unfinished" /> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="182" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="145" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="142" /> + <source>Update</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="185" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="148" /> <source>Download</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="153" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="156" /> <source>Download & Install</source> <translation type="unfinished" /> </message> <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="191" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="164" /> + <source>Cancel</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="170" /> + <source>Install</source> + <translation type="unfinished" /> + </message> + <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="188" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="161" /> - <source>Cancel</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="167" /> - <source>Install</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="185" /> <source>Download && Install</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="191" /> - <source>Close && Install</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="194" /> + <source>Close && Install</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="197" /> <source>Close</source> <translation type="unfinished" /> </message> @@ -61450,97 +61567,102 @@ <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="603" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="591" /> <source>Plugins Repository URL Changed</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="604" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="592" /> <source>The URL of the Plugins Repository has changed. Select the "Update" button to get the new repository file.</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="613" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="601" /> <source>Read plugins repository file</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="614" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="602" /> <source><p>The plugins repository file <b>{0}</b> could not be read. Select Update</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="623" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="611" /> <source>No plugin repository file available. Select Update.</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="627" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="615" /> <source>New: <b>{0}</b></source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="629" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="617" /> <source>Local Updates: <b>{0}</b></source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="632" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="620" /> <source>Remote Updates: <b>{0}</b></source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="705" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="673" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="693" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="661" /> <source>Error downloading file</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="706" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="674" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="694" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="662" /> <source><p>Could not download the requested file from {0}.</p><p>Error: {1}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="677" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="665" /> <source>No connection to Internet.</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="849" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="810" /> <source>up-to-date</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="852" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="813" /> <source>new download available</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="856" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="818" /> <source>update installable</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="860" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="823" /> <source>updated download available</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="864" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="828" /> <source>error determining status</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1269" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1239" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1002" /> + <source>{0}. {1}</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1346" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1316" /> <source>Cleanup of Plugin Downloads</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1273" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1242" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1350" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1319" /> <source><p>The plugin download <b>{0}</b> could not be deleted.</p><p>Reason: {1}</p></source> <translation type="unfinished" /> </message> @@ -61548,17 +61670,17 @@ <context> <name>PluginRepositoryWindow</name> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1126" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1203" /> <source>Process Generation Error</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1127" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1204" /> <source><p>Could not start the process.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1131" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1208" /> <source>OK</source> <translation type="unfinished" /> </message> @@ -61935,18 +62057,18 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1908" /> + <location filename="../Preferences/__init__.py" line="1909" /> <source>Export Preferences</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/__init__.py" line="1937" /> - <location filename="../Preferences/__init__.py" line="1910" /> + <location filename="../Preferences/__init__.py" line="1938" /> + <location filename="../Preferences/__init__.py" line="1911" /> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/__init__.py" line="1935" /> + <location filename="../Preferences/__init__.py" line="1936" /> <source>Import Preferences</source> <translation type="unfinished" /> </message> @@ -62504,79 +62626,79 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="273" /> + <location filename="../Preferences/ProgramsDialog.py" line="275" /> <source>PyPI Package Management</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="525" /> - <location filename="../Preferences/ProgramsDialog.py" line="522" /> - <location filename="../Preferences/ProgramsDialog.py" line="506" /> - <location filename="../Preferences/ProgramsDialog.py" line="376" /> - <location filename="../Preferences/ProgramsDialog.py" line="309" /> - <location filename="../Preferences/ProgramsDialog.py" line="292" /> + <location filename="../Preferences/ProgramsDialog.py" line="527" /> + <location filename="../Preferences/ProgramsDialog.py" line="524" /> + <location filename="../Preferences/ProgramsDialog.py" line="508" /> + <location filename="../Preferences/ProgramsDialog.py" line="378" /> + <location filename="../Preferences/ProgramsDialog.py" line="311" /> + <location filename="../Preferences/ProgramsDialog.py" line="294" /> <source>(unknown)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="296" /> + <location filename="../Preferences/ProgramsDialog.py" line="298" /> <source>Spell Checker - PyEnchant</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="313" /> + <location filename="../Preferences/ProgramsDialog.py" line="315" /> <source>Source Highlighter - Pygments</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="320" /> + <location filename="../Preferences/ProgramsDialog.py" line="322" /> <source>MicroPython - MPY Cross Compiler</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="327" /> + <location filename="../Preferences/ProgramsDialog.py" line="329" /> <source>MicroPython - ESP Tool</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="338" /> + <location filename="../Preferences/ProgramsDialog.py" line="340" /> <source>MicroPython - PyBoard Flasher</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="348" /> + <location filename="../Preferences/ProgramsDialog.py" line="350" /> <source>MicroPython - STLink Info</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="358" /> + <location filename="../Preferences/ProgramsDialog.py" line="360" /> <source>MicroPython - STLink Flasher</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="380" /> + <location filename="../Preferences/ProgramsDialog.py" line="382" /> <source>Code Assistant - Jedi</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="460" /> + <location filename="../Preferences/ProgramsDialog.py" line="462" /> <source>(not configured)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="495" /> + <location filename="../Preferences/ProgramsDialog.py" line="497" /> <source>(module not found)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="528" /> + <location filename="../Preferences/ProgramsDialog.py" line="530" /> <source>(not executable)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="574" /> + <location filename="../Preferences/ProgramsDialog.py" line="576" /> + <location filename="../Preferences/ProgramsDialog.py" line="544" /> <location filename="../Preferences/ProgramsDialog.py" line="542" /> - <location filename="../Preferences/ProgramsDialog.py" line="540" /> <source>(not found)</source> <translation type="unfinished" /> </message> @@ -66770,7 +66892,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="306" /> + <location filename="../Project/PropertiesDialog.py" line="312" /> <location filename="../Project/PropertiesDialog.py" line="71" /> <source>None</source> <translation type="unfinished" /> @@ -66796,12 +66918,12 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="261" /> + <location filename="../Project/PropertiesDialog.py" line="267" /> <source>Source Files ({0});;All Files (*)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="265" /> + <location filename="../Project/PropertiesDialog.py" line="271" /> <source>All Files (*)</source> <translation type="unfinished" /> </message> @@ -66842,22 +66964,22 @@ <context> <name>Purge</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="76" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/purge.py" line="83" /> <source>Purge All Files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="77" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/purge.py" line="84" /> <source>Do really want to delete all files not tracked by Mercurial (including ignored ones)?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="82" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/purge.py" line="89" /> <source>Purge Files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="83" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/purge.py" line="90" /> <source>Do really want to delete files not tracked by Mercurial?</source> <translation type="unfinished" /> </message> @@ -66865,79 +66987,115 @@ <context> <name>PurgeProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="36" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="34" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="36" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="34" /> <source>Purge Files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="43" /> - <source>Delete files and directories not known to Mercurial</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="46" /> - <source><b>Purge Files</b><p>This deletes files and directories not known to Mercurial. That means that purge will delete:<ul><li>unknown files (marked with "not tracked" in the status dialog)</li><li>empty directories</li></ul>Note that ignored files will be left untouched.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="61" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="60" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="43" /> + <source>Delete not version controlled files and directories</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="46" /> + <source><b>Purge Files</b><p>This deletes not version controlled files and directories. That means that purge will delete:<ul><li>not version controlled files (marked with "not tracked" in the status dialog)</li><li>empty directories</li></ul>Note that ignored files will be left untouched.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="61" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="60" /> <source>Purge All Files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="68" /> - <source>Delete files and directories not known to Mercurial including ignored ones</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="74" /> - <source><b>Purge All Files</b><p>This deletes files and directories not known to Mercurial. That means that purge will delete:<ul><li>unknown files (marked with "not tracked" in the status dialog)</li><li>empty directories</li><li>ignored files and directories</li></ul></p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="89" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="68" /> + <source>Delete not version controlled files and directories including ignored ones</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="74" /> + <source><b>Purge All Files</b><p>This deletes not version controlled files and directories. That means that purge will delete:<ul><li>not version controlled files (marked with "not tracked" in the status dialog)</li><li>empty directories</li><li>ignored files and directories</li></ul></p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="90" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="89" /> + <source>Purge Ignored Files</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="97" /> + <source>Delete ignored files and directories</source> + <translation type="unfinished" /> + </message> + <message> + <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/PurgeExtension/ProjectHelper.py" line="91" /> + <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/PurgeExtension/ProjectHelper.py" line="98" /> - <source>List files and directories not known to Mercurial</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="101" /> - <source><b>List Files to be Purged</b><p>This lists files and directories not known to Mercurial. These would be deleted by the "Purge Files" menu entry.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="111" /> + <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="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="131" /> <source>List All Files to be Purged</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="112" /> + <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/PurgeExtension/ProjectHelper.py" line="119" /> - <source>List files and directories not known to Mercurial including ignored ones</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="125" /> - <source><b>List All Files to be Purged</b><p>This lists files and directories not known to Mercurial 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/PurgeExtension/ProjectHelper.py" line="163" /> + <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="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="156" /> + <source>List Ignored Files to be Purged</source> + <translation type="unfinished" /> + </message> + <message> + <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="164" /> + <source>List ignored files and directories</source> + <translation type="unfinished" /> + </message> + <message> + <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="206" /> <source>Purge</source> <translation type="unfinished" /> </message> @@ -75751,49 +75909,49 @@ <context> <name>Shelve</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="105" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="105" /> <source>Shelve current changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="151" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="151" /> <source>Restore shelved changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="170" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="170" /> <source>Abort restore operation</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="191" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="191" /> <source>Continue restore operation</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="211" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="211" /> <source>Select the shelves to be deleted:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="231" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="222" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="231" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="222" /> <source>Delete shelves</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="223" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="223" /> <source>Do you really want to delete these shelves?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="249" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="242" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="249" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="242" /> <source>Delete all shelves</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="243" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="243" /> <source>Do you really want to delete all shelved changes?</source> <translation type="unfinished" /> </message> @@ -75801,21 +75959,21 @@ <context> <name>ShelveProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="62" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="57" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="52" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="47" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="62" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="57" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="52" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="47" /> <source>Shelve changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="122" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="74" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="122" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="74" /> <source>Shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="104" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="104" /> <source>The project should be reread. Do this now?</source> <translation type="unfinished" /> </message> @@ -75823,154 +75981,154 @@ <context> <name>ShelveProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="34" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="34" /> <source>Shelve changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="35" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="35" /> <source>Shelve changes...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="42" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="42" /> <source>Shelve all current changes of the project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="45" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="45" /> <source><b>Shelve changes</b><p>This shelves all current changes of the project.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="54" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="54" /> <source>Show shelve browser</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="55" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="55" /> <source>Show shelve browser...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="61" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="61" /> <source>Show a dialog with all shelves</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="63" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="63" /> <source><b>Show shelve browser...</b><p>This shows a dialog listing all available shelves. Actions on these shelves may be executed via the context menu.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="74" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="74" /> <source>Restore shelved change</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="75" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="75" /> <source>Restore shelved change...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="82" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="82" /> <source>Restore a shelved change to the project directory</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="85" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="85" /> <source><b>Restore shelved change</b><p>This restore a shelved change to the project directory.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="95" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="95" /> <source>Abort restore</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="96" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="96" /> <source>Abort restore...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="103" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="103" /> <source>Abort the restore operation in progress</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="106" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="106" /> <source><b>Abort restore</b><p>This aborts the restore operation in progress and reverts already applied changes.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="116" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="116" /> <source>Continue restore</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="117" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="117" /> <source>Continue restore...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="124" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="124" /> <source>Continue the restore operation in progress</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="127" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="127" /> <source><b>Continue restore</b><p>This continues the restore operation in progress.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="136" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="136" /> <source>Delete shelved changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="137" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="137" /> <source>Delete shelved changes...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="144" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="144" /> <source><b>Delete shelved changes...</b><p>This opens a dialog to select the shelved changes to delete and deletes the selected ones.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="155" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="154" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="155" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="154" /> <source>Delete ALL shelved changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="162" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="162" /> <source><b>Delete ALL shelved changes</b><p>This deletes all shelved changes.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="231" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="202" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="231" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="202" /> <source>Shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="218" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="218" /> <source>The project should be reread. Do this now?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="244" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="244" /> <source>Unshelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="251" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="251" /> <source>Abort Unshelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="258" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="258" /> <source>Continue Unshelve</source> <translation type="unfinished" /> </message> @@ -78597,44 +78755,6 @@ </message> </context> <context> - <name>Strip</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/strip.py" line="68" /> - <source>Stripping changesets from repository</source> - <translation type="unfinished" /> - </message> - </context> - <context> - <name>StripProjectHelper</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="37" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="35" /> - <source>Strip changesets</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="43" /> - <source>Strip changesets from a repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="45" /> - <source><b>Strip changesets</b><p>This deletes a changeset and all its descendants from a repository. Each removed changeset will be stored in .hg/strip-backup as a bundle file.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="91" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="79" /> - <source>Strip</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="92" /> - <source>The project should be reread. Do this now?</source> - <translation type="unfinished" /> - </message> - </context> - <context> <name>SubstyleDefinitionDialog</name> <message> <location filename="../Preferences/SubstyleDefinitionDialog.py" line="44" /> @@ -79733,12 +79853,12 @@ <context> <name>SvnDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="165" /> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="168" /> <source>Process Generation Error</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="166" /> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="169" /> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished" /> </message> @@ -90165,6 +90285,66 @@ </message> </context> <context> + <name>Uncommit</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/uncommit.py" line="64" /> + <source>Undo Local Commit</source> + <translation type="unfinished" /> + </message> + </context> + <context> + <name>UncommitProjectBrowserHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="145" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="82" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="72" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="62" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="52" /> + <source>Undo Local Commit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="96" /> + <source>Uncommit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="126" /> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished" /> + </message> + </context> + <context> + <name>UncommitProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="107" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="38" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="36" /> + <source>Undo Local Commit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="44" /> + <source>Undo the effect of a local commit.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="46" /> + <source><b>Undo Local Commit</b><p>This undoes the effect of a local commit, returning the affected files to their uncommitted state.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="79" /> + <source>Uncommit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="95" /> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished" /> + </message> + </context> + <context> <name>UnittestExecutor</name> <message> <location filename="../Testing/Interfaces/UnittestExecutor.py" line="52" /> @@ -90811,7 +90991,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7892" /> + <location filename="../UI/UserInterface.py" line="7893" /> <location filename="../UI/UserInterface.py" line="1955" /> <location filename="../UI/UserInterface.py" line="1948" /> <source>Load session</source> @@ -92139,8 +92319,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7600" /> - <location filename="../UI/UserInterface.py" line="7581" /> + <location filename="../UI/UserInterface.py" line="7601" /> + <location filename="../UI/UserInterface.py" line="7582" /> <location filename="../UI/UserInterface.py" line="3402" /> <source>Export Keyboard Shortcuts</source> <translation type="unfinished" /> @@ -92161,7 +92341,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7619" /> + <location filename="../UI/UserInterface.py" line="7620" /> <location filename="../UI/UserInterface.py" line="3421" /> <source>Import Keyboard Shortcuts</source> <translation type="unfinished" /> @@ -92886,169 +93066,169 @@ <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7108" /> - <location filename="../UI/UserInterface.py" line="7046" /> - <location filename="../UI/UserInterface.py" line="7002" /> - <location filename="../UI/UserInterface.py" line="6928" /> - <location filename="../UI/UserInterface.py" line="6864" /> - <source>Documentation Missing</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="7109" /> <location filename="../UI/UserInterface.py" line="7047" /> <location filename="../UI/UserInterface.py" line="7003" /> <location filename="../UI/UserInterface.py" line="6929" /> <location filename="../UI/UserInterface.py" line="6865" /> + <source>Documentation Missing</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7110" /> + <location filename="../UI/UserInterface.py" line="7048" /> + <location filename="../UI/UserInterface.py" line="7004" /> + <location filename="../UI/UserInterface.py" line="6930" /> + <location filename="../UI/UserInterface.py" line="6866" /> <source><p>The documentation starting point "<b>{0}</b>" could not be found.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7090" /> - <location filename="../UI/UserInterface.py" line="6972" /> - <source>Documentation</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../UI/UserInterface.py" line="6973" /> - <source><p>The PyQt{0} documentation starting point has not been configured.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="7091" /> + <location filename="../UI/UserInterface.py" line="6973" /> + <source>Documentation</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="6974" /> + <source><p>The PyQt{0} documentation starting point has not been configured.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7092" /> <source><p>The PySide{0} documentation starting point has not been configured.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7270" /> - <location filename="../UI/UserInterface.py" line="7206" /> - <source>Start Web Browser</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../UI/UserInterface.py" line="7207" /> - <source>The eric web browser could not be started.</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="7271" /> + <location filename="../UI/UserInterface.py" line="7207" /> + <source>Start Web Browser</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7208" /> + <source>The eric web browser could not be started.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7272" /> <source><p>The eric web browser is not started.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7317" /> + <location filename="../UI/UserInterface.py" line="7318" /> <source>Open Browser</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7317" /> + <location filename="../UI/UserInterface.py" line="7318" /> <source>Could not start a web browser</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7621" /> - <location filename="../UI/UserInterface.py" line="7583" /> + <location filename="../UI/UserInterface.py" line="7622" /> + <location filename="../UI/UserInterface.py" line="7584" /> <source>Keyboard Shortcuts File (*.ekj)</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7601" /> + <location filename="../UI/UserInterface.py" line="7602" /> <source><p>The keyboard shortcuts file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7805" /> + <location filename="../UI/UserInterface.py" line="7806" /> <source>Load crash session...</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7808" /> + <location filename="../UI/UserInterface.py" line="7809" /> <source>Clean crash sessions...</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7845" /> - <source>Read Session</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="7846" /> + <source>Read Session</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7847" /> <source><p>The session file <b>{0}</b> could not be read.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7869" /> + <location filename="../UI/UserInterface.py" line="7870" /> <source>Save Session</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7894" /> - <location filename="../UI/UserInterface.py" line="7871" /> + <location filename="../UI/UserInterface.py" line="7895" /> + <location filename="../UI/UserInterface.py" line="7872" /> <source>eric Session Files (*.esj)</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7963" /> - <source>Found Crash Sessions</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="7964" /> + <source>Found Crash Sessions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7965" /> <source>These crash session files were found. Select the one to open. Select 'Cancel' to not open a crash session.</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="8037" /> - <source>Clean stale crash sessions</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="8038" /> + <source>Clean stale crash sessions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8039" /> <source>Do you really want to delete these stale crash session files?</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="8414" /> - <source>Drop Error</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="8415" /> + <source>Drop Error</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8416" /> <source><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="8612" /> - <source>Upgrade available</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="8613" /> + <source>Upgrade available</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8614" /> <source><p>A newer version of the <b>eric-ide</b> package is available at <a href="{0}/eric-ide/">PyPI</a>.</p><p>Installed: {1}<br/>Available: <b>{2}</b></p><p>Shall <b>eric-ide</b> be upgraded?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="8661" /> - <source>First time usage</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="8662" /> + <source>First time usage</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8663" /> <source>eric has not been configured yet. The configuration dialog will be started.</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="8684" /> + <location filename="../UI/UserInterface.py" line="8685" /> <source>Select Workspace Directory</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="8852" /> - <source>Unsaved Data Detected</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="8853" /> + <source>Unsaved Data Detected</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8854" /> <source>Some editors contain unsaved data. Shall these be saved?</source> <translation type="unfinished" /> </message> @@ -100034,7 +100214,7 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>&Browsing History</source> + <source>Browsing History</source> <translation type="unfinished" /> </message> <message> @@ -100074,7 +100254,7 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>&Search History</source> + <source>Search History</source> <translation type="unfinished" /> </message> <message> @@ -100084,7 +100264,7 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>Download &History</source> + <source>Download History</source> <translation type="unfinished" /> </message> <message> @@ -100094,7 +100274,7 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>&Cookies</source> + <source>Cookies</source> <translation type="unfinished" /> </message> <message> @@ -100104,7 +100284,7 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>Cached &Web Pages</source> + <source>Cached Web Pages</source> <translation type="unfinished" /> </message> <message> @@ -100114,7 +100294,17 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>Website &Icons</source> + <source>Website Icons</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> + <source>Select to clear the website permissions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> + <source>Website Permissions</source> <translation type="unfinished" /> </message> <message> @@ -100124,7 +100314,7 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>Saved &Passwords</source> + <source>Saved Passwords</source> <translation type="unfinished" /> </message> <message> @@ -100134,7 +100324,7 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>&Zoom Settings</source> + <source>Zoom Settings</source> <translation type="unfinished" /> </message> <message> @@ -100675,6 +100865,16 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/WebBrowserPage.ui" line="0" /> + <source>Select to store website permission settings in memory only.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserPage.ui" line="0" /> + <source>Do not persist website permissions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserPage.ui" line="0" /> <source><p>Select to allow reading from all canvas elements.</p> <p><b>Note:</b> Disable this option to prevent canvas fingerprinting.</p></source> <translation type="unfinished" /> @@ -101087,32 +101287,87 @@ <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="194" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="78" /> + <source><p>Allow <b>{0}</b> to access your location information?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="83" /> + <source><p>Allow <b>{0}</b> to access your microphone?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="89" /> + <source><p>Allow <b>{0}</b> to access your webcam?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="95" /> + <source><p>Allow <b>{0}</b> to access your microphone and webcam?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="100" /> + <source><p>Allow <b>{0}</b> to lock your mouse cursor?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="105" /> + <source><p>Allow <b>{0}</b> to capture video of your desktop?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="111" /> + <source><p>Allow <b>{0}</b> to capture audio and video of your desktop?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="118" /> + <source><p>Allow <b>{0}</b> to show notifications on your desktop?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="124" /> + <source><p>Allow <b>{0}</b> to read from and write to the clipboard?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="130" /> + <source><p>Allow <b>{0}</b> to access fonts stored on this machine?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="269" /> <source>Suspicuous URL detected</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="195" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="270" /> <source><p>The URL <b>{0}</b> was found in the Safe Browsing database.</p>{1}</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="541" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="396" /> + <source>Permission Request</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="636" /> <source>Register Protocol Handler</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="542" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="637" /> <source><p>Allow the Web Site <b>{0}</b> to handle all <b>{1}</b> links?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="631" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="726" /> <source>SSL Info</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="632" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="727" /> <source>This site does not contain SSL information.</source> <translation type="unfinished" /> </message> @@ -103704,15 +103959,15 @@ <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5231" /> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5221" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5248" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5238" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2220" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2218" /> <source>IP Address Report</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5245" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5262" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2232" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2230" /> <source>Domain Report</source> @@ -103739,8 +103994,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5651" /> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5632" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5675" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5656" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2270" /> <source>Export Keyboard Shortcuts</source> <translation type="unfinished" /> @@ -103761,7 +104016,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5671" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5695" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2289" /> <source>Import Keyboard Shortcuts</source> <translation type="unfinished" /> @@ -104011,99 +104266,99 @@ <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4768" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4785" /> <source>System</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4772" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4789" /> <source>ISO</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4775" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4792" /> <source>Unicode</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4778" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4795" /> <source>Windows</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4781" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4798" /> <source>IBM</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4784" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4801" /> <source>Apple</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4787" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4804" /> <source>Other</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4814" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4831" /> <source>Menu Bar</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4819" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4836" /> <source>Bookmarks</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4824" /> - <source>Status Bar</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4839" /> - <source>&Show all</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../WebBrowser/WebBrowserWindow.py" line="4841" /> + <source>Status Bar</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4856" /> + <source>&Show all</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4858" /> <source>&Hide all</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5187" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5204" /> <source>VirusTotal Scan</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5188" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5205" /> <source><p>The VirusTotal scan could not be scheduled.<p> <p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5222" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5239" /> <source>Enter a valid IPv4 address in dotted quad notation:</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5232" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5249" /> <source>The given IP address is not in dotted quad notation.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5246" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5263" /> <source>Enter a valid domain name:</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5673" /> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5634" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5697" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5658" /> <source>Keyboard Shortcuts File (*.ekj)</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5652" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5676" /> <source><p>The keyboard shortcuts file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished" /> </message> @@ -105203,38 +105458,38 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1383" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1389" /> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1955" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1391" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1964" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397" /> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1961" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1970" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1403" /> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1968" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1404" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1977" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1410" /> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1410" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1416" /> <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> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1429" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1435" /> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -105245,35 +105500,35 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1929" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1938" /> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1936" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945" /> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1943" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1952" /> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1948" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1957" /> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1975" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1984" /> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1981" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990" /> <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>
--- a/src/eric7/i18n/eric7_en.ts Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/i18n/eric7_en.ts Tue Jan 14 17:29:56 2025 +0100 @@ -7658,18 +7658,18 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="896" /> + <location filename="../Preferences/ConfigurationDialog.py" line="903" /> <location filename="../Preferences/ConfigurationDialog.py" line="228" /> <source>Hex Editor</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1129" /> - <location filename="../Preferences/ConfigurationDialog.py" line="1090" /> - <location filename="../Preferences/ConfigurationDialog.py" line="982" /> - <location filename="../Preferences/ConfigurationDialog.py" line="944" /> - <location filename="../Preferences/ConfigurationDialog.py" line="913" /> - <location filename="../Preferences/ConfigurationDialog.py" line="882" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1136" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1097" /> + <location filename="../Preferences/ConfigurationDialog.py" line="989" /> + <location filename="../Preferences/ConfigurationDialog.py" line="951" /> + <location filename="../Preferences/ConfigurationDialog.py" line="920" /> + <location filename="../Preferences/ConfigurationDialog.py" line="889" /> <location filename="../Preferences/ConfigurationDialog.py" line="785" /> <location filename="../Preferences/ConfigurationDialog.py" line="670" /> <location filename="../Preferences/ConfigurationDialog.py" line="235" /> @@ -7687,7 +7687,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1104" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1111" /> <location filename="../Preferences/ConfigurationDialog.py" line="250" /> <source>MicroPython</source> <translation type="unfinished" /> @@ -7704,8 +7704,9 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1111" /> - <location filename="../Preferences/ConfigurationDialog.py" line="958" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1118" /> + <location filename="../Preferences/ConfigurationDialog.py" line="965" /> + <location filename="../Preferences/ConfigurationDialog.py" line="806" /> <location filename="../Preferences/ConfigurationDialog.py" line="271" /> <source>Network Proxy</source> <translation type="unfinished" /> @@ -7716,13 +7717,13 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="927" /> + <location filename="../Preferences/ConfigurationDialog.py" line="934" /> <location filename="../Preferences/ConfigurationDialog.py" line="285" /> <source>PDF Viewer</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="965" /> + <location filename="../Preferences/ConfigurationDialog.py" line="972" /> <location filename="../Preferences/ConfigurationDialog.py" line="292" /> <source>Python Package Management</source> <translation type="unfinished" /> @@ -7733,7 +7734,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="806" /> + <location filename="../Preferences/ConfigurationDialog.py" line="813" /> <location filename="../Preferences/ConfigurationDialog.py" line="684" /> <location filename="../Preferences/ConfigurationDialog.py" line="306" /> <source>Printer</source> @@ -7750,13 +7751,13 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="813" /> + <location filename="../Preferences/ConfigurationDialog.py" line="820" /> <location filename="../Preferences/ConfigurationDialog.py" line="321" /> <source>Security</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="996" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1003" /> <location filename="../Preferences/ConfigurationDialog.py" line="328" /> <source>Shell</source> <translation type="unfinished" /> @@ -7772,7 +7773,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="865" /> + <location filename="../Preferences/ConfigurationDialog.py" line="872" /> <location filename="../Preferences/ConfigurationDialog.py" line="343" /> <source>Tray Starter</source> <translation type="unfinished" /> @@ -7788,7 +7789,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1003" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1010" /> <location filename="../Preferences/ConfigurationDialog.py" line="698" /> <location filename="../Preferences/ConfigurationDialog.py" line="399" /> <location filename="../Preferences/ConfigurationDialog.py" line="364" /> @@ -7823,14 +7824,14 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1010" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1017" /> <location filename="../Preferences/ConfigurationDialog.py" line="712" /> <location filename="../Preferences/ConfigurationDialog.py" line="413" /> <source>Searching</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="848" /> + <location filename="../Preferences/ConfigurationDialog.py" line="855" /> <location filename="../Preferences/ConfigurationDialog.py" line="719" /> <location filename="../Preferences/ConfigurationDialog.py" line="648" /> <location filename="../Preferences/ConfigurationDialog.py" line="420" /> @@ -7838,7 +7839,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1017" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1024" /> <location filename="../Preferences/ConfigurationDialog.py" line="726" /> <location filename="../Preferences/ConfigurationDialog.py" line="427" /> <source>Style</source> @@ -7861,14 +7862,14 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1024" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1031" /> <location filename="../Preferences/ConfigurationDialog.py" line="455" /> <source>Autocompletion</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1045" /> - <location filename="../Preferences/ConfigurationDialog.py" line="1031" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1052" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1038" /> <location filename="../Preferences/ConfigurationDialog.py" line="483" /> <location filename="../Preferences/ConfigurationDialog.py" line="462" /> <source>QScintilla</source> @@ -7882,13 +7883,13 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1038" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1045" /> <location filename="../Preferences/ConfigurationDialog.py" line="476" /> <source>Calltips</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1052" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1059" /> <location filename="../Preferences/ConfigurationDialog.py" line="740" /> <location filename="../Preferences/ConfigurationDialog.py" line="497" /> <source>Highlighters</source> @@ -7901,21 +7902,21 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1059" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1066" /> <location filename="../Preferences/ConfigurationDialog.py" line="754" /> <location filename="../Preferences/ConfigurationDialog.py" line="511" /> <source>Styles</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1066" /> - <location filename="../Preferences/ConfigurationDialog.py" line="761" /> - <location filename="../Preferences/ConfigurationDialog.py" line="518" /> - <source>Keywords</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Preferences/ConfigurationDialog.py" line="1073" /> + <location filename="../Preferences/ConfigurationDialog.py" line="761" /> + <location filename="../Preferences/ConfigurationDialog.py" line="518" /> + <source>Keywords</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1080" /> <location filename="../Preferences/ConfigurationDialog.py" line="768" /> <location filename="../Preferences/ConfigurationDialog.py" line="525" /> <source>Properties</source> @@ -7932,7 +7933,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="820" /> + <location filename="../Preferences/ConfigurationDialog.py" line="827" /> <location filename="../Preferences/ConfigurationDialog.py" line="553" /> <source>Help Documentation</source> <translation type="unfinished" /> @@ -7959,12 +7960,12 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1136" /> - <location filename="../Preferences/ConfigurationDialog.py" line="1097" /> - <location filename="../Preferences/ConfigurationDialog.py" line="989" /> - <location filename="../Preferences/ConfigurationDialog.py" line="951" /> - <location filename="../Preferences/ConfigurationDialog.py" line="920" /> - <location filename="../Preferences/ConfigurationDialog.py" line="889" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1143" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1104" /> + <location filename="../Preferences/ConfigurationDialog.py" line="996" /> + <location filename="../Preferences/ConfigurationDialog.py" line="958" /> + <location filename="../Preferences/ConfigurationDialog.py" line="927" /> + <location filename="../Preferences/ConfigurationDialog.py" line="896" /> <location filename="../Preferences/ConfigurationDialog.py" line="792" /> <location filename="../Preferences/ConfigurationDialog.py" line="677" /> <location filename="../Preferences/ConfigurationDialog.py" line="602" /> @@ -7983,46 +7984,46 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="827" /> + <location filename="../Preferences/ConfigurationDialog.py" line="834" /> <location filename="../Preferences/ConfigurationDialog.py" line="627" /> <source>Appearance</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="834" /> - <location filename="../Preferences/ConfigurationDialog.py" line="634" /> - <source>eric Web Browser</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Preferences/ConfigurationDialog.py" line="841" /> + <location filename="../Preferences/ConfigurationDialog.py" line="634" /> + <source>eric Web Browser</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationDialog.py" line="848" /> <location filename="../Preferences/ConfigurationDialog.py" line="641" /> <source>VirusTotal Interface</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1228" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1235" /> <source>Enter search text...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1303" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1310" /> <source>Preferences</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1309" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1316" /> <source>Please select an entry of the list to display the configuration page.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1392" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1399" /> <source>Configuration Page Error</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1393" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1400" /> <source><p>The configuration page <b>{0}</b> could not be loaded.</p></source> <translation type="unfinished" /> </message> @@ -10573,12 +10574,12 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="1691" /> + <location filename="../Debugger/DebuggerInterfacePython.py" line="1692" /> <source>Debug Protocol Error</source> <translation type="unfinished" /> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="1692" /> + <location filename="../Debugger/DebuggerInterfacePython.py" line="1693" /> <source><p>The response received from the debugger backend could not be decoded. Please report this issue with the received data to the eric bugs email address.</p><p>Error: {0}</p><p>Data:<br/>{1}</p></source> <translation type="unfinished" /> </message> @@ -22562,64 +22563,147 @@ </message> </context> <context> + <name>Fastexport</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="183" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="174" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="168" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="159" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="133" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="113" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="57" /> + <source>Mercurial Fastexport</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="58" /> + <source><p>The output file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="107" /> + <source>Cancel</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="110" /> + <source>%v/%m Changesets</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="116" /> + <source>Exporting repository (time remaining: {0}) ...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="134" /> + <source><p>The repository fastexport process sent an error message.</p><p>{0}</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="160" /> + <source><p>The repository fastexport process finished successfully.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="169" /> + <source><p>The repository fastexport process was cancelled.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="175" /> + <source><p>The repository fastexport process finished with exit code <b>{0}</b>.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="184" /> + <source><p>The repository fastexport process crashed.</p></source> + <translation type="unfinished" /> + </message> + </context> + <context> + <name>FastexportProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="37" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="35" /> + <source>Export to git</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="44" /> + <source>Export the repository as git fast-import stream.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="47" /> + <source><b>Export to git</b><p>This exports the repository as a git fast-import stream.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="79" /> + <source>Fastexport</source> + <translation type="unfinished" /> + </message> + </context> + <context> <name>FeaturePermissionBar</name> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="48" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="50" /> <source>{0} wants to use your position.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="51" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="53" /> <source>{0} wants to use your microphone.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="54" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="56" /> <source>{0} wants to use your camera.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="57" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="59" /> <source>{0} wants to use your microphone and camera.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="60" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="62" /> <source>{0} wants to lock your mouse.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="61" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="63" /> <source>{0} wants to capture video of your screen.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="64" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="66" /> <source>{0} wants to capture audio and video of your screen.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="67" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="69" /> <source>{0} wants to use desktop notifications.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="92" /> - <source>Remember</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="94" /> + <source>Remember</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="96" /> <source>Allow</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="95" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="97" /> <source>Deny</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="120" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="122" /> <source>{0} wants to use an unknown feature.</source> <translation type="unfinished" /> </message> @@ -22627,80 +22711,106 @@ <context> <name>FeaturePermissionsDialog</name> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="161" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="143" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="127" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="109" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="93" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="79" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="65" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="49" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="208" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="190" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="170" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="152" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="136" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="118" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="102" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="88" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="74" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="58" /> <source>Host</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="162" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="144" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="128" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="110" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="94" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="80" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="66" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="50" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="209" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="191" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="171" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="153" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="137" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="119" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="103" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="89" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="75" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="59" /> <source>Permission</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="54" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="63" /> <source>Notifications</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="68" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="77" /> <source>Geolocation</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="82" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="91" /> <source>Microphone</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="96" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="105" /> <source>Camera</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="114" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="123" /> <source>Microphone && Camera</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="130" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="139" /> <source>Mouse Lock</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="148" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="157" /> <source>Desktop Video</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="166" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="175" /> <source>Desktop Audio && Video</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="181" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="195" /> + <source>Clipboard</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="213" /> + <source>Local Fonts</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="296" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="253" /> <source>Allow</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="182" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="297" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="254" /> <source>Deny</source> <translation type="unfinished" /> </message> <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="255" /> + <source>Always Ask</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="256" /> + <source>Invalid</source> + <translation type="unfinished" /> + </message> + <message> <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.ui" line="0" /> <source>HTML5 Feature Permissions</source> <translation type="unfinished" /> @@ -24572,23 +24682,23 @@ <translation type="unfinished" /> </message> <message> - <location filename="../UI/FindFileWidget.py" line="750" /> + <location filename="../UI/FindFileWidget.py" line="749" /> <source>Invalid search expression</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/FindFileWidget.py" line="751" /> + <location filename="../UI/FindFileWidget.py" line="750" /> <source><p>The search expression is not valid.</p><p>Error: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/FindFileWidget.py" line="878" /> + <location filename="../UI/FindFileWidget.py" line="877" /> <source>{0} / {1}</source> <comment>occurrences / files</comment> <translation type="unfinished" /> </message> <message numerus="yes"> - <location filename="../UI/FindFileWidget.py" line="881" /> + <location filename="../UI/FindFileWidget.py" line="880" /> <source>%n occurrence(s)</source> <translation> <numerusform>%n occurrence</numerusform> @@ -24596,7 +24706,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../UI/FindFileWidget.py" line="882" /> + <location filename="../UI/FindFileWidget.py" line="881" /> <source>%n file(s)</source> <translation> <numerusform>%n file</numerusform> @@ -24604,44 +24714,44 @@ </translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1081" /> - <location filename="../UI/FindFileWidget.py" line="1056" /> - <location filename="../UI/FindFileWidget.py" line="1042" /> + <location filename="../UI/FindFileWidget.py" line="1080" /> + <location filename="../UI/FindFileWidget.py" line="1055" /> + <location filename="../UI/FindFileWidget.py" line="1041" /> <source>Replace in Files</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1043" /> + <location filename="../UI/FindFileWidget.py" line="1042" /> <source><p>Could not read the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1057" /> + <location filename="../UI/FindFileWidget.py" line="1056" /> <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 type="unfinished" /> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1082" /> + <location filename="../UI/FindFileWidget.py" line="1081" /> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1111" /> + <location filename="../UI/FindFileWidget.py" line="1110" /> <source>Open</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1113" /> + <location filename="../UI/FindFileWidget.py" line="1112" /> <source>Copy Path to Clipboard</source> <translation type="unfinished" /> </message> <message> + <location filename="../UI/FindFileWidget.py" line="1116" /> + <source>Select All</source> + <translation type="unfinished" /> + </message> + <message> <location filename="../UI/FindFileWidget.py" line="1117" /> - <source>Select All</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../UI/FindFileWidget.py" line="1118" /> <source>Deselect All</source> <translation type="unfinished" /> </message> @@ -26817,37 +26927,37 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="91" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="94" /> <source>Additional Output</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="110" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="113" /> <source>Process canceled.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="124" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="127" /> <source>Process finished successfully.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="126" /> - <source>Process crashed.</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="129" /> + <source>Process crashed.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="132" /> <source>Process finished with exit code {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="195" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="198" /> <source>Process Generation Error</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="196" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="199" /> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished" /> </message> @@ -35211,456 +35321,456 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="303" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="309" /> <source>Create project repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="304" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="310" /> <source>The project repository could not be created.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="338" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="344" /> <source>Creating Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="359" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="365" /> <source>Initial commit to Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="405" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="411" /> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="516" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="522" /> <source>Commit Changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="517" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="523" /> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="580" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="586" /> <source>Committing changes to Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="679" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="685" /> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="719" /> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="774" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="780" /> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="829" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="835" /> <source>Renaming {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="964" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="970" /> <source>Tagging in the Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1011" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1000" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1017" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006" /> <source>Revert changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1001" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1007" /> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1012" /> - <source>Do you really want to revert all changes of the project?</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1018" /> + <source>Do you really want to revert all changes of the project?</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1024" /> <source>Reverting changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1064" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1070" /> <source>Merging</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1095" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1109" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101" /> <source>Re-Merge</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1102" /> <source>Do you really want to re-merge these files or directories?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1104" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1110" /> <source>Do you really want to re-merge the project?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1114" /> <source>Re-Merging</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1131" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1137" /> <source>Current branch tip</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1314" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1320" /> <source>Mercurial command</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1492" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1498" /> <source>Copying {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1758" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1746" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1764" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1752" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743" /> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1759" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1765" /> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2457" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2446" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2436" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1835" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2455" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844" /> <source>Apply changegroups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1838" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1847" /> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1884" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1893" /> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2027" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2036" /> <source>Marking as 'unresolved'</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2029" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038" /> <source>Marking as 'resolved'</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2051" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060" /> <source>Aborting uncommitted merge</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2084" /> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086" /> - <source>Created new branch <{0}>.</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2095" /> + <source>Created new branch <{0}>.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2104" /> <source>Showing current branch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2184" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193" /> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2200" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209" /> <source>Showing the combined configuration settings</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2224" /> <source>Showing aliases for remote repositories</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2230" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239" /> <source>Recovering from interrupted transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254" /> <source>Identifying project directory</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2291" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2300" /> <source>Create .hgignore file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2292" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301" /> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2395" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2369" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2351" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2404" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2378" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2360" /> <source>Create changegroup</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2353" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362" /> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2370" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2379" /> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2409" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2418" /> <source>Preview changegroup</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2438" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2411" /> - <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2447" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2420" /> + <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2456" /> <source>Shall the working directory be updated?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2479" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2488" /> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2501" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2510" /> <source>Mercurial Bisect ({0})</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2527" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2536" /> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2576" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2557" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2585" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2566" /> <source>Backing out changeset</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2558" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2567" /> <source>No revision given. Aborting...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2587" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2602" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2596" /> <source>Rollback last transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2588" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2597" /> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2657" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2666" /> <source>Import Patch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2707" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2716" /> <source>Export Patches</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2749" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2758" /> <source>Change Phase</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2804" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813" /> <source>Copy Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2843" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2852" /> <source>Copy Changesets (Continue)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2853" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2862" /> <source>Copy Changesets (Stop)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2863" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2872" /> <source>Copy Changesets (Abort)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2887" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2896" /> <source>Create Unversioned Archive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2902" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2911" /> <source>Delete All Backups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2903" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2912" /> <source><p>Do you really want to delete all backup bundles stored in the backup area?<br/><b>{0}</b></p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2994" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2974" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2963" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2983" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2972" /> <source>Add Sub-repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3033" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2964" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3042" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2973" /> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2975" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2984" /> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3051" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3060" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3004" /> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3050" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3032" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3018" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3059" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3027" /> <source>Remove Sub-repositories</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3019" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3028" /> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3296" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3138" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3147" /> <source>Mercurial Command Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3139" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3148" /> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3297" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3321" /> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3420" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3444" /> <source>Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3437" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3461" /> <source>Delete Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3438" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3462" /> <source>Select the bookmark to be deleted:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3449" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3473" /> <source>Delete Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3476" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3500" /> <source>Rename Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3518" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3542" /> <source>Move Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3600" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3624" /> <source>Pull Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3601" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3625" /> <source>Select the bookmark to be pulled:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3613" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3637" /> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3641" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3665" /> <source>Push Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3642" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3666" /> <source>Select the bookmark to be push:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3657" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3681" /> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished" /> </message> @@ -36503,42 +36613,42 @@ <context> <name>HgClient</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="98" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="100" /> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="147" /> - <source>Did not receive the 'hello' message.</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="149" /> + <source>Did not receive the 'hello' message.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="151" /> <source>Received data on unexpected channel.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="154" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="156" /> <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="159" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="161" /> <source>'capabilities' message did not contain any capability.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="168" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="170" /> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="173" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="175" /> <source>'encoding' message did not contain any encoding.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="385" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="387" /> <source>For message see output dialog.</source> <translation type="unfinished" /> </message> @@ -36899,6 +37009,11 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="0" /> + <source>%v/%m</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="0" /> <source>Errors</source> <translation type="unfinished" /> </message> @@ -36942,6 +37057,11 @@ <source>Alt+P</source> <translation type="unfinished" /> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="211" /> + <source>Time remaining: {0}</source> + <translation type="unfinished" /> + </message> </context> <context> <name>HgDiffDialog</name> @@ -37121,6 +37241,69 @@ </message> </context> <context> + <name>HgFastexportConfigDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>fastexport Configuration</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the path of the file for the exported marks.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the path of the output file.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Revisions:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the path of the file containing already exported marks.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Author Map:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Import Marks:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Export Marks:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Output File:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the revisions, tags or branches to be exported (separated by comma).</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the path of the author map file.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.py" line="42" /> + <source>Text Files (*.txt);;All Files (*)</source> + <translation type="unfinished" /> + </message> + </context> + <context> <name>HgGpgSignDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="0" /> @@ -37932,7 +38115,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3049" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3063" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298" /> <source>Select Branches</source> <translation type="unfinished" /> @@ -37973,7 +38156,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2218" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2227" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> <source>Copy Changesets</source> <translation type="unfinished" /> @@ -38030,8 +38213,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2312" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2295" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2321" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2304" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="387" /> <source>Switch</source> <translation type="unfinished" /> @@ -38062,263 +38245,270 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2430" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1622" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="415" /> - <source>Pull Changes</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="418" /> - <source>Pull changes from a remote repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="420" /> + <source>Pull Selected Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="419" /> + <source>Pull selected changes from a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="423" /> + <source>Pull All Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="427" /> + <source>Pull all changes from a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="430" /> <source>Pull Large Files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="422" /> - <source>Pull large files for selected revisions</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="428" /> - <source>Push Selected Changes</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="432" /> - <source>Push changes of the selected changeset and its ancestors to a remote repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="439" /> - <source>Push All Changes</source> + <source>Pull large files for selected revisions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="438" /> + <source>Push Selected Changes</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="442" /> - <source>Push all changes to a remote repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="448" /> - <source>Create Changegroup</source> + <source>Push changes of the selected changeset and its ancestors to a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="449" /> + <source>Push All Changes</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="452" /> + <source>Push all changes to a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="458" /> + <source>Create Changegroup</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="462" /> <source>Create a changegroup file containing the selected changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="455" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="465" /> <source><b>Create Changegroup</b> <p>This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2569" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="468" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2583" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="478" /> <source>Apply Changegroup</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="472" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="482" /> <source>Apply the currently viewed changegroup file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="489" /> <source>Sign Revisions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="483" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="493" /> <source>Add a signature for the selected revisions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="487" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="497" /> <source>Verify Signatures</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="491" /> - <source>Verify all signatures there may be for the selected revision</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2476" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498" /> - <source>Strip Changesets</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="501" /> + <source>Verify all signatures there may be for the selected revision</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="508" /> + <source>Strip Changesets</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="511" /> <source>Strip changesets from a repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="506" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="516" /> <source>Select All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="509" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="519" /> <source>Deselect All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="958" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="934" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="911" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="885" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="968" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="944" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="921" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="895" /> <source>Mercurial Error</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1266" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1276" /> <source>{0} (large file)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1532" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1542" /> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1543" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1553" /> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1701" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1620" /> - <source>Pull Selected Changes</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2570" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2477" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2431" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2313" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2219" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2584" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2491" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2322" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2228" /> <source>The project should be reread. Do this now?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2296" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2305" /> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2341" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2350" /> <source>Define Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2342" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2351" /> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2371" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2380" /> <source>Move Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2372" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2381" /> <source>Select the bookmark to be moved to changeset '{0}':</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2444" /> + <source>Pull Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2727" /> <source>Find Commit</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2714" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728" /> <source>'{0}' was not found.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2774" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2788" /> <source>Generating differences ...</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2775" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2789" /> <source>Differences</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2794" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2808" /> <source>No differences available. Get some more log entries.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2796" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2810" /> <source>No differences available.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2807" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2821" /> <source>Differences to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2823" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2837" /> <source>Diff to Parent {0}{1}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2846" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2860" /> <source>There is no difference.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2999" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2983" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2965" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3013" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2997" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2979" /> <source>Save Diff</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2967" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2981" /> <source>Patch Files (*.diff)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2984" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2998" /> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3000" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3014" /> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3031" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3045" /> <source>closed</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3032" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3046" /> <source>inactive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3041" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3055" /> <source>{0} ({1})</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3050" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3064" /> <source>Select the branches to be shown (none for 'All'):</source> <translation type="unfinished" /> </message> @@ -38827,208 +39017,213 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="282" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="309" /> + <source>Other Functions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="335" /> <source>Extensions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="718" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="604" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="556" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="451" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="308" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="774" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="659" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="611" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="505" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="361" /> <source>Version Control</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="734" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="620" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="467" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="324" /> - <source>Commit changes to repository...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="742" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="628" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="475" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="332" /> - <source>Add to repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="748" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="481" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="338" /> - <source>Remove from repository (and disk)</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1012" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="999" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="487" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="344" /> - <source>Remove from repository only</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="639" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="349" /> - <source>Copy</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="641" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="351" /> - <source>Move</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="646" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="356" /> - <source>Show log browser</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="755" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="653" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="494" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="363" /> - <source>Show status</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="762" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="660" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="501" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="370" /> - <source>Show differences</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="376" /> - <source>Show differences side-by-side</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="768" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="666" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="507" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="382" /> - <source>Show differences (extended)</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="388" /> - <source>Show differences side-by-side (extended)</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="394" /> - <source>Show annotated file</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="398" /> - <source>Show annotated file with skip list</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="402" /> - <source>Create skip list file</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="775" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="673" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="514" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="408" /> - <source>Revert changes</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="779" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="677" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="518" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="412" /> - <source>Conflicts resolved</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="781" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="679" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="520" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="414" /> - <source>Conflicts unresolved</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="783" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="681" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="522" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="416" /> - <source>Re-Merge</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="787" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="685" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="571" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="526" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="420" /> - <source>Select all local file entries</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="790" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="688" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="574" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="529" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="423" /> - <source>Select all versioned file entries</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="793" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="691" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="675" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="521" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="377" /> + <source>Commit changes to repository...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="799" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="684" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="530" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="386" /> + <source>Add to repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="805" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="690" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="536" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="392" /> + <source>Remove from repository (and disk)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1069" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1056" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="542" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="398" /> + <source>Remove from repository only</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="695" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="403" /> + <source>Copy</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="697" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="405" /> + <source>Move</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="702" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="410" /> + <source>Show log browser</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="812" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="709" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="549" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="417" /> + <source>Show status</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="819" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="716" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="556" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="424" /> + <source>Show differences</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="430" /> + <source>Show differences side-by-side</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="825" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="722" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="562" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="436" /> + <source>Show differences (extended)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="442" /> + <source>Show differences side-by-side (extended)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="448" /> + <source>Show annotated file</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="452" /> + <source>Show annotated file with skip list</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="456" /> + <source>Create skip list file</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="832" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="729" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="569" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="462" /> + <source>Revert changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="836" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="733" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="573" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="466" /> + <source>Conflicts resolved</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="735" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="575" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="468" /> + <source>Conflicts unresolved</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="840" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="737" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="577" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="532" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="426" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="470" /> + <source>Re-Merge</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="844" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="741" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="581" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="474" /> + <source>Select all local file entries</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="847" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="744" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="629" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="584" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="477" /> + <source>Select all versioned file entries</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="850" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="747" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="632" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="587" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="480" /> <source>Select all local directory entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="797" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="695" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="581" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="536" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="430" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="854" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="751" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="591" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="484" /> <source>Select all versioned directory entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="801" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="699" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="585" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="540" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="434" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="858" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="755" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="640" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="595" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="488" /> <source>Configure...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="916" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="973" /> <source>Create {0} file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="917" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="974" /> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1013" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1000" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1070" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1057" /> <source>Do you really want to remove these files from the repository?</source> <translation type="unfinished" /> </message> @@ -39036,1513 +39231,1518 @@ <context> <name>HgProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="126" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="135" /> <source>New from repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="128" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="137" /> <source>&New from repository...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="135" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="144" /> <source>Create (clone) a new project from a Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="138" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="147" /> <source><b>New from repository</b><p>This creates (clones) a new local project from a Mercurial repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="150" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="148" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="159" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="157" /> <source>Show incoming log</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="156" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="165" /> <source>Show the log of incoming changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="158" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="167" /> <source><b>Show incoming log</b><p>This shows the log of changes coming into the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="170" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="168" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="179" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="177" /> <source>Pull changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="176" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="185" /> <source>Pull changes from a remote repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="178" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="187" /> <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="188" /> - <source>Update from repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="190" /> - <source>&Update from repository</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="197" /> + <source>Update from repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="199" /> + <source>&Update from repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="206" /> <source>Update the local project from the Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="200" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="209" /> <source><b>Update from repository</b><p>This updates the local project from the Mercurial repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="210" /> - <source>Commit changes to repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="212" /> - <source>&Commit changes to repository...</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="219" /> + <source>Commit changes to repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="221" /> + <source>&Commit changes to repository...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="228" /> <source>Commit changes to the local project to the Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="231" /> <source><b>Commit changes to repository</b><p>This commits changes to the local project to the Mercurial repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="234" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="232" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="243" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="241" /> <source>Show outgoing log</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="240" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="249" /> <source>Show the log of outgoing changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="242" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251" /> <source><b>Show outgoing log</b><p>This shows the log of changes outgoing out of the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="254" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="252" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261" /> <source>Push changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="260" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="269" /> <source>Push changes to a remote repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="262" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271" /> <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="274" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="272" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281" /> <source>Push changes (force)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="290" /> <source>Push changes to a remote repository with force option</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="284" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293" /> <source><b>Push changes (force)</b><p>This pushes changes from the local repository to a remote repository using the 'force' option.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="294" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="303" /> <source>Export from repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="296" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="305" /> <source>&Export from repository...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="302" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="311" /> <source>Export a project from the repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="313" /> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="313" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="324" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322" /> <source>Show log browser</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="331" /> <source>Show a dialog to browse the log of the local project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="334" /> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="336" /> - <source>Show differences</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="338" /> - <source>Show &difference</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="345" /> + <source>Show differences</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347" /> + <source>Show &difference</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="354" /> <source>Show the difference of the local project to the repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="357" /> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="360" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="358" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="369" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="367" /> <source>Show differences (extended)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="367" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376" /> <source>Show the difference of revisions of the project to the repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="370" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379" /> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="380" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389" /> <source>Show status</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="391" /> <source>Show &status...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="397" /> <source>Show the status of the local project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390" /> - <source><b>Show status</b><p>This shows the status of the local project.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="399" /> - <source>Show Summary</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="401" /> - <source>Show summary...</source> + <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408" /> + <source>Show Summary</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="410" /> + <source>Show summary...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="417" /> <source>Show summary information of the working directory status</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="411" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420" /> <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="430" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="430" /> <source>Show heads</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="432" /> <source>Show the heads of the repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="425" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="434" /> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="434" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="443" /> <source>Show parents</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="441" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450" /> <source>Show the parents of the repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="443" /> - <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="452" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="452" /> + <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461" /> <source>Show tip</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="463" /> <source>Show the tip of the repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="456" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="465" /> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462" /> - <source>Revert changes</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464" /> - <source>Re&vert changes</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471" /> + <source>Revert changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="473" /> + <source>Re&vert changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="480" /> <source>Revert all changes made to the local project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483" /> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2110" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2129" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492" /> <source>Merge</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="485" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494" /> <source>Mer&ge changes...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501" /> <source>Merge changes of a revision into the local project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="495" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="504" /> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="506" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="515" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514" /> <source>Commit Merge</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521" /> <source>Commit all the merged changes.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="523" /> <source><b>Commit a merge</b><p>This commits a merge working directory</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="523" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="533" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="532" /> <source>Abort Merge</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="531" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540" /> <source>Abort an uncommitted merge and lose all changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="543" /> <source><b>Abort uncommitted merge</b><p>This aborts an uncommitted merge causing all changes to be lost.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="546" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="544" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="553" /> <source>Re-Merge</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="553" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="562" /> <source>Re-Merge all conflicting, unresolved files of the project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="556" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="565" /> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="575" /> <source>Show conflicts</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="576" /> <source>Show conflicts...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="583" /> <source>Show a dialog listing all files with conflicts</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586" /> <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596" /> <source>Conflicts resolved</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="597" /> <source>Con&flicts resolved</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604" /> <source>Mark all conflicts of the local project as resolved</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="607" /> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617" /> <source>Conflicts unresolved</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625" /> <source>Mark all conflicts of the local project as unresolved</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628" /> <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638" /> <source>Tag in repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640" /> <source>&Tag in repository...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="637" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646" /> <source>Tag the local project in the repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="639" /> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648" /> - <source>List tags</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="649" /> - <source>List tags...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655" /> - <source>List tags of the project</source> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657" /> - <source><b>List tags</b><p>This lists the tags of the project.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663" /> - <source>List branches</source> + <source>List tags</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="658" /> + <source>List tags...</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="664" /> - <source>List branches...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670" /> - <source>List branches of the project</source> + <source>List tags of the project</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666" /> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672" /> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <source>List branches</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673" /> + <source>List branches...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="679" /> + <source>List branches of the project</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681" /> - <source>Create branch</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="683" /> - <source>Create &branch...</source> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="690" /> + <source>Create branch</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692" /> + <source>Create &branch...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699" /> <source>Create a new branch for the local project in the repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="693" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="702" /> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712" /> <source>Push new branch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721" /> <source>Push the current branch of the local project as a new named branch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="717" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726" /> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="738" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736" /> <source>Close branch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="745" /> <source>Close the current branch of the local project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748" /> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="758" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757" /> <source>Show current branch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="756" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765" /> <source>Show the current branch of the project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="759" /> - <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768" /> - <source>Switch</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770" /> - <source>S&witch...</source> + <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777" /> + <source>Switch</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="779" /> + <source>S&witch...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786" /> <source>Switch the working directory to another revision</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="780" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="789" /> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799" /> <source>Cleanup</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799" /> <source>Cleanu&p</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="792" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801" /> <source>Cleanup the local project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794" /> - <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="803" /> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="812" /> <source>Execute command</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813" /> <source>E&xecute command...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="811" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="820" /> <source>Execute an arbitrary Mercurial command</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="814" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="823" /> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="824" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833" /> <source>Configure</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="834" /> <source>Configure...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="841" /> <source>Show the configuration dialog with the Mercurial page selected</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="835" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="844" /> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854" /> <source>Edit user configuration</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855" /> <source>Edit user configuration...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="862" /> <source>Show an editor to edit the user configuration file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="856" /> - <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865" /> + <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874" /> <source>Edit repository configuration</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875" /> <source>Edit repository configuration...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="873" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882" /> <source>Show an editor to edit the repository configuration file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="876" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885" /> <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895" /> <source>Show combined configuration settings</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896" /> <source>Show combined configuration settings...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="894" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903" /> <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909" /> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919" /> <source>Show paths</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="911" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="920" /> <source>Show paths...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="918" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="927" /> <source>Show the aliases for remote repositories</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="921" /> - <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930" /> - <source>Verify repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="931" /> - <source>Verify repository...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937" /> - <source>Verify the integrity of the repository</source> + <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="939" /> - <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> + <source>Verify repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="940" /> + <source>Verify repository...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="946" /> + <source>Verify the integrity of the repository</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="948" /> + <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="957" /> <source>Recover</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="948" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="957" /> <source>Recover...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="951" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960" /> <source>Recover from an interrupted transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="954" /> - <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="963" /> - <source>Identify</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964" /> - <source>Identify...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="970" /> - <source>Identify the project directory</source> + <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="972" /> + <source>Identify</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973" /> + <source>Identify...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979" /> + <source>Identify the project directory</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="981" /> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="981" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="990" /> <source>Create .hgignore</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="989" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="998" /> <source>Create a .hgignore file with default values</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="992" /> - <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001" /> - <source>Create changegroup</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1003" /> - <source>Create changegroup...</source> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010" /> + <source>Create changegroup</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1012" /> + <source>Create changegroup...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1019" /> <source>Create changegroup file collecting changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1013" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1022" /> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1023" /> - <source>Preview changegroup</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1025" /> - <source>Preview changegroup...</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032" /> + <source>Preview changegroup</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1034" /> + <source>Preview changegroup...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041" /> <source>Preview a changegroup file containing a collection of changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044" /> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2244" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1045" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2263" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054" /> <source>Apply changegroups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1047" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056" /> <source>Apply changegroups...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063" /> <source>Apply one or several changegroup files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066" /> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1067" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076" /> <source>Mark as "good"</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1077" /> <source>Mark as "good"...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1075" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1084" /> <source>Mark a selectable changeset as good</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1078" /> - <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1087" /> - <source>Mark as "bad"</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088" /> - <source>Mark as "bad"...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1094" /> - <source>Mark a selectable changeset as bad</source> + <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1096" /> - <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105" /> - <source>Skip</source> + <source>Mark as "bad"</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1097" /> + <source>Mark as "bad"...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103" /> + <source>Mark a selectable changeset as bad</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105" /> + <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1114" /> + <source>Skip</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1114" /> <source>Skip...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1107" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116" /> <source>Skip a selectable changeset</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1109" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118" /> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1115" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1115" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124" /> <source>Reset</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1117" /> - <source>Reset the bisect search data</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119" /> - <source><b>Reset</b><p>This resets the bisect search data.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1126" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1125" /> + <source>Reset the bisect search data</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128" /> + <source><b>Reset</b><p>This resets the bisect search data.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1135" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134" /> <source>Back out changeset</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1142" /> <source>Back out changes of an earlier changeset</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1145" /> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1145" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1155" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154" /> <source>Rollback last transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1152" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161" /> <source>Rollback the last transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1163" /> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1176" /> - <source>Serve project repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1177" /> - <source>Serve project repository...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183" /> - <source>Serve the project repository</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185" /> + <source>Serve project repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1186" /> + <source>Serve project repository...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1192" /> + <source>Serve the project repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1194" /> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2301" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1194" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1203" /> <source>Import Patch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1196" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1205" /> <source>Import Patch...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1202" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211" /> <source>Import a patch from a patch file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1204" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1213" /> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1214" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1223" /> <source>Export Patches</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1225" /> <source>Export Patches...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1222" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1231" /> <source>Export revisions to patch files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1224" /> - <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233" /> - <source>Change Phase</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234" /> - <source>Change Phase...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1240" /> - <source>Change the phase of revisions</source> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1242" /> + <source>Change Phase</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1243" /> + <source>Change Phase...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1249" /> + <source>Change the phase of revisions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251" /> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2343" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1804" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1253" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2362" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1822" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1262" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1260" /> <source>Copy Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1259" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1268" /> <source>Copies changesets from another branch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1261" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270" /> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1273" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1272" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1282" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1281" /> <source>Continue Copying Session</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1280" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1289" /> <source>Continue the last copying session after conflicts were resolved</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1283" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1292" /> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1294" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1293" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1303" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1302" /> <source>Stop Copying Session</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1310" /> <source>Stop the interrupted copying session</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1304" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1313" /> <source><b>Stop Copying Session</b><p>This stops the interrupted copying session.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1314" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1313" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1323" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1322" /> <source>Abort Copying Session</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1321" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330" /> <source>Abort the interrupted copying session and rollback</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1324" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1333" /> <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1334" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1343" /> <source>Add</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1336" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1345" /> <source>Add...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1342" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1351" /> <source>Add a sub-repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1344" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1353" /> <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1350" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1359" /> <source>Remove</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1352" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1361" /> <source>Remove...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1358" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367" /> <source>Remove sub-repositories</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1360" /> - <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1369" /> - <source>Create unversioned archive</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1371" /> - <source>Create unversioned archive...</source> + <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1378" /> + <source>Create unversioned archive</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1380" /> + <source>Create unversioned archive...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1387" /> <source>Create an unversioned archive from the repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1381" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1390" /> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1391" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1400" /> <source>List bookmarks</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1393" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1402" /> <source>List bookmarks...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1399" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1408" /> <source>List bookmarks of the project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1401" /> - <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1410" /> - <source>Define bookmark</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1412" /> - <source>Define bookmark...</source> + <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1419" /> + <source>Define bookmark</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1421" /> + <source>Define bookmark...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1428" /> <source>Define a bookmark for the project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1422" /> - <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1431" /> - <source>Delete bookmark</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1433" /> - <source>Delete bookmark...</source> + <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1440" /> + <source>Delete bookmark</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1442" /> + <source>Delete bookmark...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1449" /> <source>Delete a bookmark of the project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1443" /> - <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1452" /> - <source>Rename bookmark</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1454" /> - <source>Rename bookmark...</source> + <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1461" /> + <source>Rename bookmark</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1463" /> + <source>Rename bookmark...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1470" /> <source>Rename a bookmark of the project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1464" /> - <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1473" /> + <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1482" /> <source>Move bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1475" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1484" /> <source>Move bookmark...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1481" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1490" /> <source>Move a bookmark of the project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1483" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1492" /> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1495" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1493" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1504" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1502" /> <source>Show incoming bookmarks</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1502" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1511" /> <source>Show a list of incoming bookmarks</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1505" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1514" /> <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1517" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1515" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1526" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1524" /> <source>Pull bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1524" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1533" /> <source>Pull a bookmark from a remote repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1527" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1536" /> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1539" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1537" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1548" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1546" /> <source>Pull current bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1546" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1555" /> <source>Pull the current bookmark from a remote repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1549" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1558" /> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1560" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1558" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1569" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1567" /> <source>Show outgoing bookmarks</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1567" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1576" /> <source>Show a list of outgoing bookmarks</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1570" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1579" /> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1582" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1580" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1591" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1589" /> <source>Push bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1589" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1598" /> <source>Push a bookmark to a remote repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1592" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1601" /> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1604" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1602" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1613" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1611" /> <source>Push current bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1611" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1620" /> <source>Push the current bookmark to a remote repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1614" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1623" /> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1626" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1624" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1635" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1633" /> <source>Push all bookmarks</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1633" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1642" /> <source>Push all bookmarks to a remote repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1636" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1645" /> <source><b>Push all bookmarks</b><p>This pushes all bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1647" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1645" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1656" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1654" /> <source>Delete all backups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1654" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1663" /> <source>Delete all backup bundles stored in the backup area</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1657" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1666" /> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1699" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1708" /> <source>Administration</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1724" /> - <source>Specials</source> - <translation>Specials</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1733" /> + <source>Specials</source> + <translation>Specials</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1742" /> <source>Changegroup Management</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1740" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1749" /> <source>Patch Management</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1746" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1755" /> <source>Bisect</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1754" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1763" /> <source>Tags</source> <translation>Tags</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1761" /> - <source>Branches</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1770" /> + <source>Branches</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1779" /> <source>Bookmarks</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1791" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1800" /> + <source>Other Functions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1809" /> <source>Extensions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1813" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1831" /> <source>Sub-Repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1818" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1836" /> <source>Merge Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1903" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1901" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1922" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1920" /> <source>Mercurial</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2054" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2073" /> <source>Pull</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2391" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2375" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2360" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2344" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2323" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2302" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2245" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2055" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2410" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2394" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2379" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2363" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2342" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2321" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2264" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2074" /> <source>The project should be reread. Do this now?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2322" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2341" /> <source>Revert Changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2359" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2378" /> <source>Copy Changesets (Continue)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2374" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2393" /> <source>Copy Changesets (Stop)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2390" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2409" /> <source>Copy Changesets (Abort)</source> <translation type="unfinished" /> </message> @@ -40550,7 +40750,7 @@ <context> <name>HgPurgeListDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/HgPurgeListDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/HgPurgeListDialog.ui" line="0" /> <source>Purge List</source> <translation type="unfinished" /> </message> @@ -41720,87 +41920,87 @@ <context> <name>HgShelveBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Mercurial Shelve Browser</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Name</source> <translation>Name</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Age</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Message</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Statistics</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>File</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Lines added</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Lines deleted</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Errors</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source><b>Mercurial shelve errors</b><p>This shows possible error messages of the hg shelve command.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="58" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="58" /> <source>&Refresh</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="60" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="60" /> <source>Press to refresh the list of shelves</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="69" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="69" /> <source>Restore selected shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="72" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="72" /> <source>Delete selected shelves</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="75" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="75" /> <source>Delete all shelves</source> <translation type="unfinished" /> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="290" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="290" /> <source>%n file(s) changed</source> <translation> <numerusform>%n file changed</numerusform> @@ -41808,7 +42008,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="292" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="292" /> <source>%n line(s) inserted</source> <translation> <numerusform>%n line inserted</numerusform> @@ -41816,7 +42016,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="295" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="295" /> <source>%n line(s) deleted</source> <translation> <numerusform>%n line deleted</numerusform> @@ -41827,57 +42027,57 @@ <context> <name>HgShelveDataDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Name:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Enter a name for the shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Date, Time:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Enter the commit date and time for the shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>yyyy-MM-dd HH:mm</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Message:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Enter a message for the shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Mark new/missing files as added/removed</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Select to shelve, but keep the changes in the working directory</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Shelve, but keep changes</source> <translation type="unfinished" /> </message> @@ -41885,7 +42085,7 @@ <context> <name>HgShelvesSelectionDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelvesSelectionDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelvesSelectionDialog.ui" line="0" /> <source>Mercurial Shelve Selection</source> <translation type="unfinished" /> </message> @@ -42186,129 +42386,6 @@ </message> </context> <context> - <name>HgStripDialog</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Strip Changesets</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>&Revision</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to specify a revision by number</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Number</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enter a revision number</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to specify a revision by changeset id</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Id:</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enter a changeset id</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to specify a revision by a tag</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Tag:</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enter a tag name</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to specify a revision by a branch</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Branch:</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enter a branch name</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Expression:</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enter a revision set expression</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Bookmark:</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enter a bookmark name</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to enforce removal of changesets</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enforce Operation</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to not create backup bundles</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>No Backup</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to keep the current working directory state</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Keep Working Directory</source> - <translation type="unfinished" /> - </message> - </context> - <context> <name>HgSummaryDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.ui" line="0" /> @@ -42809,29 +42886,118 @@ </message> </context> <context> + <name>HgUncommitDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Undo Local Commit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Commit Message</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Enter the log message.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source><b>Log Message</b> +<p>Enter the log message for the uncommit action.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Recent commit messages</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Select a recent commit message to use</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Select to allow an empty commit after undoing it.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Allow empty commit after undoing commit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Select to allow undoing the commit with outstanding changes.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Allow undoing commit with outstanding changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Author</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Enter author name to override the configured user:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Enter an author name in order to override the configured one</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Select to give date and time information</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Date and Time</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Date/Time:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Enter the date and time to be used</source> + <translation type="unfinished" /> + </message> + </context> + <context> <name>HgUnshelveDataDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Mercurial Unshelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Name:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Enter the name of the shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Select to keep the shelved change</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Keep shelved change</source> <translation type="unfinished" /> </message> @@ -42901,22 +43067,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> @@ -42932,52 +43098,42 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the Purge 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>Purge</source> + <source>Histedit</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the queues extension</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Queues</source> + <source>Select to activate the GPG 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>GPG</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Rebase</source> + <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 shelve extension</source> + <source>Fastexport</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Shelve</source> + <source>Select to activate the uncommit extension</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the strip extension</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Strip</source> + <source>Uncommit</source> <translation type="unfinished" /> </message> <message> @@ -43197,32 +43353,32 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="527" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="474" /> <source>Delete Host Fingerprint</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="528" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="475" /> <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="644" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="591" /> <source>Delete Host Minimum Protocol</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="645" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="592" /> <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="708" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="655" /> <source>Edit User Configuration</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="709" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="656" /> <source>You will loose all changes made in this dialog. Shall the data be saved first?</source> <translation type="unfinished" /> </message> @@ -43301,17 +43457,17 @@ <context> <name>HgUtilities</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="130" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="132" /> <source>The hg process finished with the exit code {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="134" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="136" /> <source>The hg process did not finish within 30s.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="138" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="140" /> <source>Could not start the hg executable.</source> <translation type="unfinished" /> </message> @@ -50615,13 +50771,13 @@ <name>Lexers</name> <message> <location filename="../QScintilla/Lexers/__init__.py" line="412" /> - <location filename="../Preferences/__init__.py" line="599" /> + <location filename="../Preferences/__init__.py" line="598" /> <source>Python Files (*.py *.py3)</source> <translation type="unfinished" /> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="505" /> - <location filename="../Preferences/__init__.py" line="602" /> + <location filename="../Preferences/__init__.py" line="601" /> <source>Python3 Files (*.py)</source> <translation type="unfinished" /> </message> @@ -52460,8 +52616,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> @@ -53826,7 +53982,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> @@ -60025,74 +60181,12 @@ </message> <message> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to install the selected package</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to install the selected package to the user site</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to show details for the selected entry</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Toggle to show or hide the search window</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Package</source> + <source>Press to refresh the lists</source> <translation type="unfinished" /> </message> <message> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Enter the search term for the package name</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Enter search term</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to start the search</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to search for more packages</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Version</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Released</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Description</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to refresh the lists</source> + <source>Press to install a package.</source> <translation type="unfinished" /> </message> <message> @@ -60112,6 +60206,17 @@ </message> <message> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Press to show details for the selected entry</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Press to remove leftovers of an upgrade or uninstall run.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> <source>Select to show only locally-installed packages</source> <translation type="unfinished" /> </message> @@ -60155,6 +60260,13 @@ <message> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Package</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> <source>Installed</source> <translation type="unfinished" /> </message> @@ -60249,316 +60361,315 @@ <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="199" /> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Search Package:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Enter package name to search for.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Press to open a web browser for searching.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="83" /> <source>pip Menu</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="233" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="113" /> <source>Author:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="234" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="114" /> <source>Author Email:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="235" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="115" /> <source>Classifiers:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="236" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="116" /> <source>Entry Points:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="237" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="117" /> <source>Files:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="238" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="118" /> <source>Homepage:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="239" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="119" /> <source>Installer:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="240" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="120" /> <source>License:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="241" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="121" /> <source>Location:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="242" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="122" /> <source>Metadata Version:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="243" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="123" /> <source>Name:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="244" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="124" /> <source>Project URLs:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="245" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="125" /> <source>Requires:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="246" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="126" /> <source>Required By:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="247" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="127" /> <source>Summary:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="248" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="128" /> <source>Version:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="450" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="335" /> <source>Getting installed packages...</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="478" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="363" /> <source>Getting outdated packages...</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1231" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1051" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1038" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1002" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="735" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="729" /> + <source>Cleanup Environment</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="730" /> + <source>The environment cleanup was successful.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="736" /> + <source>Some leftover package directories could not been removed. Delete them manually.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="834" /> <source>Search PyPI</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1003" /> - <source><p>Received an error while searching for <b>{0}</b>.</p><p>Error: {1}</p></source> - <translation type="unfinished" /> - </message> - <message numerus="yes"> - <location filename="../PipInterface/PipPackagesWidget.py" line="1018" /> - <source>%n package(s) found.</source> - <translation> - <numerusform>%n package found.</numerusform> - <numerusform>%n packages found.</numerusform> - </translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1025" /> - <source>Showing first {0} packages found.</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1044" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1039" /> - <source><p>There were no results for <b>{0}</b>.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1052" /> - <source><p>There were no more results for <b>{0}</b>.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1232" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="835" /> <source><p>No package details info for <b>{0}</b> available.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1251" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="854" /> <source>Pip</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1253" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="856" /> <source>Install Pip</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1256" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="859" /> <source>Install Pip to User-Site</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1259" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="862" /> <source>Repair Pip</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1266" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="869" /> <source>Install</source> <translation type="unfinished" /> </message> <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1048" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="871" /> + <source>Install Packages</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="874" /> + <source>Install Local Package</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="877" /> + <source>Re-Install Selected Packages</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="884" /> + <source>Requirements/Constraints</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="886" /> + <source>Install Requirements</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="889" /> + <source>Uninstall Requirements</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="892" /> + <source>Generate Requirements...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="896" /> + <source>Install from 'pyproject.toml'</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="900" /> + <source>Uninstall from 'pyproject.toml'</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="905" /> + <source>Generate Constraints...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="912" /> + <source>Cache</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="914" /> + <source>Show Cache Info...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="917" /> + <source>Show Cached Files...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="920" /> + <source>Remove Cached Files...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="923" /> + <source>Purge Cache...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="940" /> + <source>Show Licenses...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="944" /> + <source>Check Vulnerabilities</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="948" /> + <source>Update Vulnerability Database</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="952" /> + <source>Create SBOM file</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="959" /> + <source>Edit User Configuration...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="962" /> + <source>Edit Environment Configuration...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="967" /> + <source>Configure...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1211" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1198" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1187" /> + <source>Edit Configuration</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1212" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1199" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1188" /> + <source>No valid configuration path determined. Aborting</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1421" /> + <source>{0} {1}</source> + <comment>package name, package version</comment> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1442" /> + <source>Affected Version:</source> + <translation type="unfinished" /> + </message> + <message> <location filename="../PipInterface/PipPackagesWidget.py" line="1445" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1268" /> - <source>Install Packages</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1271" /> - <source>Install Local Package</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1274" /> - <source>Re-Install Selected Packages</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1281" /> - <source>Requirements/Constraints</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1283" /> - <source>Install Requirements</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1286" /> - <source>Uninstall Requirements</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1289" /> - <source>Generate Requirements...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1293" /> - <source>Install from 'pyproject.toml'</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1297" /> - <source>Uninstall from 'pyproject.toml'</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1302" /> - <source>Generate Constraints...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1309" /> - <source>Cache</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1311" /> - <source>Show Cache Info...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1314" /> - <source>Show Cached Files...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1317" /> - <source>Remove Cached Files...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1320" /> - <source>Purge Cache...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1337" /> - <source>Show Licenses...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1341" /> - <source>Check Vulnerabilities</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1345" /> - <source>Update Vulnerability Database</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1349" /> - <source>Create SBOM file</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1356" /> - <source>Edit User Configuration...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1359" /> - <source>Edit Environment Configuration...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1364" /> - <source>Configure...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1608" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1595" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1584" /> - <source>Edit Configuration</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1609" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1596" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1585" /> - <source>No valid configuration path determined. Aborting</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1818" /> - <source>{0} {1}</source> - <comment>package name, package version</comment> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1839" /> - <source>Affected Version:</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1842" /> <source>Advisory:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1977" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1952" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1580" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1555" /> <source>unknown</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1974" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1577" /> <source>any</source> <translation type="unfinished" /> </message> @@ -61394,64 +61505,69 @@ <name>PluginRepositoryWidget</name> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="124" /> - <source>Stable</source> + <source>Obsolete</source> <translation type="unfinished" /> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="125" /> - <source>Unstable</source> + <source>Stable</source> <translation type="unfinished" /> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="126" /> - <source>Obsolete</source> + <source>Unknown</source> <translation type="unfinished" /> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="127" /> - <source>Unknown</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="179" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="139" /> - <source>Update</source> + <source>Unstable</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="128" /> + <source>Upgrade Available</source> <translation type="unfinished" /> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="182" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="145" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="142" /> + <source>Update</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="185" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="148" /> <source>Download</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="153" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="156" /> <source>Download & Install</source> <translation type="unfinished" /> </message> <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="191" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="164" /> + <source>Cancel</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="170" /> + <source>Install</source> + <translation type="unfinished" /> + </message> + <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="188" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="161" /> - <source>Cancel</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="167" /> - <source>Install</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="185" /> <source>Download && Install</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="191" /> - <source>Close && Install</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="194" /> + <source>Close && Install</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="197" /> <source>Close</source> <translation type="unfinished" /> </message> @@ -61503,97 +61619,102 @@ <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="603" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="591" /> <source>Plugins Repository URL Changed</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="604" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="592" /> <source>The URL of the Plugins Repository has changed. Select the "Update" button to get the new repository file.</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="613" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="601" /> <source>Read plugins repository file</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="614" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="602" /> <source><p>The plugins repository file <b>{0}</b> could not be read. Select Update</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="623" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="611" /> <source>No plugin repository file available. Select Update.</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="627" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="615" /> <source>New: <b>{0}</b></source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="629" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="617" /> <source>Local Updates: <b>{0}</b></source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="632" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="620" /> <source>Remote Updates: <b>{0}</b></source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="705" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="673" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="693" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="661" /> <source>Error downloading file</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="706" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="674" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="694" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="662" /> <source><p>Could not download the requested file from {0}.</p><p>Error: {1}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="677" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="665" /> <source>No connection to Internet.</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="849" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="810" /> <source>up-to-date</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="852" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="813" /> <source>new download available</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="856" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="818" /> <source>update installable</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="860" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="823" /> <source>updated download available</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="864" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="828" /> <source>error determining status</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1269" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1239" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1002" /> + <source>{0}. {1}</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1346" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1316" /> <source>Cleanup of Plugin Downloads</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1273" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1242" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1350" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1319" /> <source><p>The plugin download <b>{0}</b> could not be deleted.</p><p>Reason: {1}</p></source> <translation type="unfinished" /> </message> @@ -61601,17 +61722,17 @@ <context> <name>PluginRepositoryWindow</name> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1126" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1203" /> <source>Process Generation Error</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1127" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1204" /> <source><p>Could not start the process.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1131" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1208" /> <source>OK</source> <translation type="unfinished" /> </message> @@ -61988,18 +62109,18 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1908" /> + <location filename="../Preferences/__init__.py" line="1909" /> <source>Export Preferences</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/__init__.py" line="1937" /> - <location filename="../Preferences/__init__.py" line="1910" /> + <location filename="../Preferences/__init__.py" line="1938" /> + <location filename="../Preferences/__init__.py" line="1911" /> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/__init__.py" line="1935" /> + <location filename="../Preferences/__init__.py" line="1936" /> <source>Import Preferences</source> <translation type="unfinished" /> </message> @@ -62557,79 +62678,79 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="273" /> + <location filename="../Preferences/ProgramsDialog.py" line="275" /> <source>PyPI Package Management</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="525" /> - <location filename="../Preferences/ProgramsDialog.py" line="522" /> - <location filename="../Preferences/ProgramsDialog.py" line="506" /> - <location filename="../Preferences/ProgramsDialog.py" line="376" /> - <location filename="../Preferences/ProgramsDialog.py" line="309" /> - <location filename="../Preferences/ProgramsDialog.py" line="292" /> + <location filename="../Preferences/ProgramsDialog.py" line="527" /> + <location filename="../Preferences/ProgramsDialog.py" line="524" /> + <location filename="../Preferences/ProgramsDialog.py" line="508" /> + <location filename="../Preferences/ProgramsDialog.py" line="378" /> + <location filename="../Preferences/ProgramsDialog.py" line="311" /> + <location filename="../Preferences/ProgramsDialog.py" line="294" /> <source>(unknown)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="296" /> + <location filename="../Preferences/ProgramsDialog.py" line="298" /> <source>Spell Checker - PyEnchant</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="313" /> + <location filename="../Preferences/ProgramsDialog.py" line="315" /> <source>Source Highlighter - Pygments</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="320" /> + <location filename="../Preferences/ProgramsDialog.py" line="322" /> <source>MicroPython - MPY Cross Compiler</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="327" /> + <location filename="../Preferences/ProgramsDialog.py" line="329" /> <source>MicroPython - ESP Tool</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="338" /> + <location filename="../Preferences/ProgramsDialog.py" line="340" /> <source>MicroPython - PyBoard Flasher</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="348" /> + <location filename="../Preferences/ProgramsDialog.py" line="350" /> <source>MicroPython - STLink Info</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="358" /> + <location filename="../Preferences/ProgramsDialog.py" line="360" /> <source>MicroPython - STLink Flasher</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="380" /> + <location filename="../Preferences/ProgramsDialog.py" line="382" /> <source>Code Assistant - Jedi</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="460" /> + <location filename="../Preferences/ProgramsDialog.py" line="462" /> <source>(not configured)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="495" /> + <location filename="../Preferences/ProgramsDialog.py" line="497" /> <source>(module not found)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="528" /> + <location filename="../Preferences/ProgramsDialog.py" line="530" /> <source>(not executable)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="574" /> + <location filename="../Preferences/ProgramsDialog.py" line="576" /> + <location filename="../Preferences/ProgramsDialog.py" line="544" /> <location filename="../Preferences/ProgramsDialog.py" line="542" /> - <location filename="../Preferences/ProgramsDialog.py" line="540" /> <source>(not found)</source> <translation type="unfinished" /> </message> @@ -66824,7 +66945,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="306" /> + <location filename="../Project/PropertiesDialog.py" line="312" /> <location filename="../Project/PropertiesDialog.py" line="71" /> <source>None</source> <translation type="unfinished" /> @@ -66850,12 +66971,12 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="261" /> + <location filename="../Project/PropertiesDialog.py" line="267" /> <source>Source Files ({0});;All Files (*)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="265" /> + <location filename="../Project/PropertiesDialog.py" line="271" /> <source>All Files (*)</source> <translation type="unfinished" /> </message> @@ -66896,22 +67017,22 @@ <context> <name>Purge</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="76" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/purge.py" line="83" /> <source>Purge All Files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="77" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/purge.py" line="84" /> <source>Do really want to delete all files not tracked by Mercurial (including ignored ones)?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="82" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/purge.py" line="89" /> <source>Purge Files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="83" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/purge.py" line="90" /> <source>Do really want to delete files not tracked by Mercurial?</source> <translation type="unfinished" /> </message> @@ -66919,79 +67040,115 @@ <context> <name>PurgeProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="36" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="34" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="36" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="34" /> <source>Purge Files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="43" /> - <source>Delete files and directories not known to Mercurial</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="46" /> - <source><b>Purge Files</b><p>This deletes files and directories not known to Mercurial. That means that purge will delete:<ul><li>unknown files (marked with "not tracked" in the status dialog)</li><li>empty directories</li></ul>Note that ignored files will be left untouched.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="61" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="60" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="43" /> + <source>Delete not version controlled files and directories</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="46" /> + <source><b>Purge Files</b><p>This deletes not version controlled files and directories. That means that purge will delete:<ul><li>not version controlled files (marked with "not tracked" in the status dialog)</li><li>empty directories</li></ul>Note that ignored files will be left untouched.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="61" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="60" /> <source>Purge All Files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="68" /> - <source>Delete files and directories not known to Mercurial including ignored ones</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="74" /> - <source><b>Purge All Files</b><p>This deletes files and directories not known to Mercurial. That means that purge will delete:<ul><li>unknown files (marked with "not tracked" in the status dialog)</li><li>empty directories</li><li>ignored files and directories</li></ul></p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="89" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="68" /> + <source>Delete not version controlled files and directories including ignored ones</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="74" /> + <source><b>Purge All Files</b><p>This deletes not version controlled files and directories. That means that purge will delete:<ul><li>not version controlled files (marked with "not tracked" in the status dialog)</li><li>empty directories</li><li>ignored files and directories</li></ul></p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="90" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="89" /> + <source>Purge Ignored Files</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="97" /> + <source>Delete ignored files and directories</source> + <translation type="unfinished" /> + </message> + <message> + <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/PurgeExtension/ProjectHelper.py" line="91" /> + <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/PurgeExtension/ProjectHelper.py" line="98" /> - <source>List files and directories not known to Mercurial</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="101" /> - <source><b>List Files to be Purged</b><p>This lists files and directories not known to Mercurial. These would be deleted by the "Purge Files" menu entry.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="111" /> + <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="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="131" /> <source>List All Files to be Purged</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="112" /> + <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/PurgeExtension/ProjectHelper.py" line="119" /> - <source>List files and directories not known to Mercurial including ignored ones</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="125" /> - <source><b>List All Files to be Purged</b><p>This lists files and directories not known to Mercurial 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/PurgeExtension/ProjectHelper.py" line="163" /> + <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="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="156" /> + <source>List Ignored Files to be Purged</source> + <translation type="unfinished" /> + </message> + <message> + <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="164" /> + <source>List ignored files and directories</source> + <translation type="unfinished" /> + </message> + <message> + <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="206" /> <source>Purge</source> <translation type="unfinished" /> </message> @@ -75806,49 +75963,49 @@ <context> <name>Shelve</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="105" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="105" /> <source>Shelve current changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="151" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="151" /> <source>Restore shelved changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="170" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="170" /> <source>Abort restore operation</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="191" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="191" /> <source>Continue restore operation</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="211" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="211" /> <source>Select the shelves to be deleted:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="231" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="222" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="231" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="222" /> <source>Delete shelves</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="223" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="223" /> <source>Do you really want to delete these shelves?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="249" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="242" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="249" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="242" /> <source>Delete all shelves</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="243" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="243" /> <source>Do you really want to delete all shelved changes?</source> <translation type="unfinished" /> </message> @@ -75856,21 +76013,21 @@ <context> <name>ShelveProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="62" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="57" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="52" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="47" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="62" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="57" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="52" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="47" /> <source>Shelve changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="122" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="74" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="122" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="74" /> <source>Shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="104" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="104" /> <source>The project should be reread. Do this now?</source> <translation type="unfinished" /> </message> @@ -75878,154 +76035,154 @@ <context> <name>ShelveProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="34" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="34" /> <source>Shelve changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="35" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="35" /> <source>Shelve changes...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="42" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="42" /> <source>Shelve all current changes of the project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="45" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="45" /> <source><b>Shelve changes</b><p>This shelves all current changes of the project.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="54" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="54" /> <source>Show shelve browser</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="55" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="55" /> <source>Show shelve browser...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="61" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="61" /> <source>Show a dialog with all shelves</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="63" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="63" /> <source><b>Show shelve browser...</b><p>This shows a dialog listing all available shelves. Actions on these shelves may be executed via the context menu.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="74" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="74" /> <source>Restore shelved change</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="75" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="75" /> <source>Restore shelved change...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="82" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="82" /> <source>Restore a shelved change to the project directory</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="85" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="85" /> <source><b>Restore shelved change</b><p>This restore a shelved change to the project directory.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="95" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="95" /> <source>Abort restore</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="96" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="96" /> <source>Abort restore...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="103" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="103" /> <source>Abort the restore operation in progress</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="106" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="106" /> <source><b>Abort restore</b><p>This aborts the restore operation in progress and reverts already applied changes.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="116" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="116" /> <source>Continue restore</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="117" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="117" /> <source>Continue restore...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="124" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="124" /> <source>Continue the restore operation in progress</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="127" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="127" /> <source><b>Continue restore</b><p>This continues the restore operation in progress.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="136" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="136" /> <source>Delete shelved changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="137" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="137" /> <source>Delete shelved changes...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="144" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="144" /> <source><b>Delete shelved changes...</b><p>This opens a dialog to select the shelved changes to delete and deletes the selected ones.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="155" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="154" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="155" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="154" /> <source>Delete ALL shelved changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="162" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="162" /> <source><b>Delete ALL shelved changes</b><p>This deletes all shelved changes.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="231" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="202" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="231" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="202" /> <source>Shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="218" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="218" /> <source>The project should be reread. Do this now?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="244" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="244" /> <source>Unshelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="251" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="251" /> <source>Abort Unshelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="258" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="258" /> <source>Continue Unshelve</source> <translation type="unfinished" /> </message> @@ -78653,44 +78810,6 @@ </message> </context> <context> - <name>Strip</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/strip.py" line="68" /> - <source>Stripping changesets from repository</source> - <translation type="unfinished" /> - </message> - </context> - <context> - <name>StripProjectHelper</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="37" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="35" /> - <source>Strip changesets</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="43" /> - <source>Strip changesets from a repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="45" /> - <source><b>Strip changesets</b><p>This deletes a changeset and all its descendants from a repository. Each removed changeset will be stored in .hg/strip-backup as a bundle file.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="91" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="79" /> - <source>Strip</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="92" /> - <source>The project should be reread. Do this now?</source> - <translation type="unfinished" /> - </message> - </context> - <context> <name>SubstyleDefinitionDialog</name> <message> <location filename="../Preferences/SubstyleDefinitionDialog.py" line="44" /> @@ -79789,12 +79908,12 @@ <context> <name>SvnDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="165" /> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="168" /> <source>Process Generation Error</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="166" /> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="169" /> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished" /> </message> @@ -90226,6 +90345,66 @@ </message> </context> <context> + <name>Uncommit</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/uncommit.py" line="64" /> + <source>Undo Local Commit</source> + <translation type="unfinished" /> + </message> + </context> + <context> + <name>UncommitProjectBrowserHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="145" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="82" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="72" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="62" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="52" /> + <source>Undo Local Commit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="96" /> + <source>Uncommit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="126" /> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished" /> + </message> + </context> + <context> + <name>UncommitProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="107" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="38" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="36" /> + <source>Undo Local Commit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="44" /> + <source>Undo the effect of a local commit.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="46" /> + <source><b>Undo Local Commit</b><p>This undoes the effect of a local commit, returning the affected files to their uncommitted state.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="79" /> + <source>Uncommit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="95" /> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished" /> + </message> + </context> + <context> <name>UnittestExecutor</name> <message> <location filename="../Testing/Interfaces/UnittestExecutor.py" line="52" /> @@ -90872,7 +91051,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7892" /> + <location filename="../UI/UserInterface.py" line="7893" /> <location filename="../UI/UserInterface.py" line="1955" /> <location filename="../UI/UserInterface.py" line="1948" /> <source>Load session</source> @@ -92200,8 +92379,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7600" /> - <location filename="../UI/UserInterface.py" line="7581" /> + <location filename="../UI/UserInterface.py" line="7601" /> + <location filename="../UI/UserInterface.py" line="7582" /> <location filename="../UI/UserInterface.py" line="3402" /> <source>Export Keyboard Shortcuts</source> <translation type="unfinished" /> @@ -92222,7 +92401,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7619" /> + <location filename="../UI/UserInterface.py" line="7620" /> <location filename="../UI/UserInterface.py" line="3421" /> <source>Import Keyboard Shortcuts</source> <translation type="unfinished" /> @@ -92947,169 +93126,169 @@ <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7108" /> - <location filename="../UI/UserInterface.py" line="7046" /> - <location filename="../UI/UserInterface.py" line="7002" /> - <location filename="../UI/UserInterface.py" line="6928" /> - <location filename="../UI/UserInterface.py" line="6864" /> - <source>Documentation Missing</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="7109" /> <location filename="../UI/UserInterface.py" line="7047" /> <location filename="../UI/UserInterface.py" line="7003" /> <location filename="../UI/UserInterface.py" line="6929" /> <location filename="../UI/UserInterface.py" line="6865" /> + <source>Documentation Missing</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7110" /> + <location filename="../UI/UserInterface.py" line="7048" /> + <location filename="../UI/UserInterface.py" line="7004" /> + <location filename="../UI/UserInterface.py" line="6930" /> + <location filename="../UI/UserInterface.py" line="6866" /> <source><p>The documentation starting point "<b>{0}</b>" could not be found.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7090" /> - <location filename="../UI/UserInterface.py" line="6972" /> - <source>Documentation</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../UI/UserInterface.py" line="6973" /> - <source><p>The PyQt{0} documentation starting point has not been configured.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="7091" /> + <location filename="../UI/UserInterface.py" line="6973" /> + <source>Documentation</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="6974" /> + <source><p>The PyQt{0} documentation starting point has not been configured.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7092" /> <source><p>The PySide{0} documentation starting point has not been configured.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7270" /> - <location filename="../UI/UserInterface.py" line="7206" /> - <source>Start Web Browser</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../UI/UserInterface.py" line="7207" /> - <source>The eric web browser could not be started.</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="7271" /> + <location filename="../UI/UserInterface.py" line="7207" /> + <source>Start Web Browser</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7208" /> + <source>The eric web browser could not be started.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7272" /> <source><p>The eric web browser is not started.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7317" /> + <location filename="../UI/UserInterface.py" line="7318" /> <source>Open Browser</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7317" /> + <location filename="../UI/UserInterface.py" line="7318" /> <source>Could not start a web browser</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7621" /> - <location filename="../UI/UserInterface.py" line="7583" /> + <location filename="../UI/UserInterface.py" line="7622" /> + <location filename="../UI/UserInterface.py" line="7584" /> <source>Keyboard Shortcuts File (*.ekj)</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7601" /> + <location filename="../UI/UserInterface.py" line="7602" /> <source><p>The keyboard shortcuts file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7805" /> + <location filename="../UI/UserInterface.py" line="7806" /> <source>Load crash session...</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7808" /> + <location filename="../UI/UserInterface.py" line="7809" /> <source>Clean crash sessions...</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7845" /> - <source>Read Session</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="7846" /> + <source>Read Session</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7847" /> <source><p>The session file <b>{0}</b> could not be read.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7869" /> + <location filename="../UI/UserInterface.py" line="7870" /> <source>Save Session</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7894" /> - <location filename="../UI/UserInterface.py" line="7871" /> + <location filename="../UI/UserInterface.py" line="7895" /> + <location filename="../UI/UserInterface.py" line="7872" /> <source>eric Session Files (*.esj)</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7963" /> - <source>Found Crash Sessions</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="7964" /> + <source>Found Crash Sessions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7965" /> <source>These crash session files were found. Select the one to open. Select 'Cancel' to not open a crash session.</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="8037" /> - <source>Clean stale crash sessions</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="8038" /> + <source>Clean stale crash sessions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8039" /> <source>Do you really want to delete these stale crash session files?</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="8414" /> - <source>Drop Error</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="8415" /> + <source>Drop Error</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8416" /> <source><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="8612" /> - <source>Upgrade available</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="8613" /> + <source>Upgrade available</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8614" /> <source><p>A newer version of the <b>eric-ide</b> package is available at <a href="{0}/eric-ide/">PyPI</a>.</p><p>Installed: {1}<br/>Available: <b>{2}</b></p><p>Shall <b>eric-ide</b> be upgraded?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="8661" /> - <source>First time usage</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="8662" /> + <source>First time usage</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8663" /> <source>eric has not been configured yet. The configuration dialog will be started.</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="8684" /> + <location filename="../UI/UserInterface.py" line="8685" /> <source>Select Workspace Directory</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="8852" /> - <source>Unsaved Data Detected</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="8853" /> + <source>Unsaved Data Detected</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8854" /> <source>Some editors contain unsaved data. Shall these be saved?</source> <translation type="unfinished" /> </message> @@ -100095,7 +100274,7 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>&Browsing History</source> + <source>Browsing History</source> <translation type="unfinished" /> </message> <message> @@ -100135,7 +100314,7 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>&Search History</source> + <source>Search History</source> <translation type="unfinished" /> </message> <message> @@ -100145,7 +100324,7 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>Download &History</source> + <source>Download History</source> <translation type="unfinished" /> </message> <message> @@ -100155,7 +100334,7 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>&Cookies</source> + <source>Cookies</source> <translation type="unfinished" /> </message> <message> @@ -100165,7 +100344,7 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>Cached &Web Pages</source> + <source>Cached Web Pages</source> <translation type="unfinished" /> </message> <message> @@ -100175,7 +100354,17 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>Website &Icons</source> + <source>Website Icons</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> + <source>Select to clear the website permissions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> + <source>Website Permissions</source> <translation type="unfinished" /> </message> <message> @@ -100185,7 +100374,7 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>Saved &Passwords</source> + <source>Saved Passwords</source> <translation type="unfinished" /> </message> <message> @@ -100195,7 +100384,7 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>&Zoom Settings</source> + <source>Zoom Settings</source> <translation type="unfinished" /> </message> <message> @@ -100736,6 +100925,16 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/WebBrowserPage.ui" line="0" /> + <source>Select to store website permission settings in memory only.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserPage.ui" line="0" /> + <source>Do not persist website permissions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserPage.ui" line="0" /> <source><p>Select to allow reading from all canvas elements.</p> <p><b>Note:</b> Disable this option to prevent canvas fingerprinting.</p></source> <translation type="unfinished" /> @@ -101148,32 +101347,87 @@ <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="194" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="78" /> + <source><p>Allow <b>{0}</b> to access your location information?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="83" /> + <source><p>Allow <b>{0}</b> to access your microphone?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="89" /> + <source><p>Allow <b>{0}</b> to access your webcam?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="95" /> + <source><p>Allow <b>{0}</b> to access your microphone and webcam?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="100" /> + <source><p>Allow <b>{0}</b> to lock your mouse cursor?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="105" /> + <source><p>Allow <b>{0}</b> to capture video of your desktop?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="111" /> + <source><p>Allow <b>{0}</b> to capture audio and video of your desktop?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="118" /> + <source><p>Allow <b>{0}</b> to show notifications on your desktop?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="124" /> + <source><p>Allow <b>{0}</b> to read from and write to the clipboard?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="130" /> + <source><p>Allow <b>{0}</b> to access fonts stored on this machine?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="269" /> <source>Suspicuous URL detected</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="195" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="270" /> <source><p>The URL <b>{0}</b> was found in the Safe Browsing database.</p>{1}</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="541" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="396" /> + <source>Permission Request</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="636" /> <source>Register Protocol Handler</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="542" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="637" /> <source><p>Allow the Web Site <b>{0}</b> to handle all <b>{1}</b> links?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="631" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="726" /> <source>SSL Info</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="632" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="727" /> <source>This site does not contain SSL information.</source> <translation type="unfinished" /> </message> @@ -103769,15 +104023,15 @@ <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5231" /> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5221" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5248" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5238" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2220" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2218" /> <source>IP Address Report</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5245" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5262" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2232" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2230" /> <source>Domain Report</source> @@ -103804,8 +104058,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5651" /> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5632" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5675" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5656" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2270" /> <source>Export Keyboard Shortcuts</source> <translation type="unfinished" /> @@ -103826,7 +104080,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5671" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5695" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2289" /> <source>Import Keyboard Shortcuts</source> <translation type="unfinished" /> @@ -104076,99 +104330,99 @@ <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4768" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4785" /> <source>System</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4772" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4789" /> <source>ISO</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4775" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4792" /> <source>Unicode</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4778" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4795" /> <source>Windows</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4781" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4798" /> <source>IBM</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4784" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4801" /> <source>Apple</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4787" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4804" /> <source>Other</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4814" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4831" /> <source>Menu Bar</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4819" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4836" /> <source>Bookmarks</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4824" /> - <source>Status Bar</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4839" /> - <source>&Show all</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../WebBrowser/WebBrowserWindow.py" line="4841" /> + <source>Status Bar</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4856" /> + <source>&Show all</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4858" /> <source>&Hide all</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5187" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5204" /> <source>VirusTotal Scan</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5188" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5205" /> <source><p>The VirusTotal scan could not be scheduled.<p> <p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5222" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5239" /> <source>Enter a valid IPv4 address in dotted quad notation:</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5232" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5249" /> <source>The given IP address is not in dotted quad notation.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5246" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5263" /> <source>Enter a valid domain name:</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5673" /> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5634" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5697" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5658" /> <source>Keyboard Shortcuts File (*.ekj)</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5652" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5676" /> <source><p>The keyboard shortcuts file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished" /> </message> @@ -105269,38 +105523,38 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1383" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1389" /> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1955" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1391" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1964" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397" /> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1961" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1970" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1403" /> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1968" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1404" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1977" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1410" /> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1410" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1416" /> <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> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1429" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1435" /> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -105311,35 +105565,35 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1929" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1938" /> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1936" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945" /> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1943" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1952" /> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1948" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1957" /> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1975" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1984" /> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1981" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990" /> <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>
--- a/src/eric7/i18n/eric7_es.ts Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/i18n/eric7_es.ts Tue Jan 14 17:29:56 2025 +0100 @@ -7703,18 +7703,18 @@ <translation>Gráficos</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="896" /> + <location filename="../Preferences/ConfigurationDialog.py" line="903" /> <location filename="../Preferences/ConfigurationDialog.py" line="228" /> <source>Hex Editor</source> <translation>Editor Hexadecimal</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1129" /> - <location filename="../Preferences/ConfigurationDialog.py" line="1090" /> - <location filename="../Preferences/ConfigurationDialog.py" line="982" /> - <location filename="../Preferences/ConfigurationDialog.py" line="944" /> - <location filename="../Preferences/ConfigurationDialog.py" line="913" /> - <location filename="../Preferences/ConfigurationDialog.py" line="882" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1136" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1097" /> + <location filename="../Preferences/ConfigurationDialog.py" line="989" /> + <location filename="../Preferences/ConfigurationDialog.py" line="951" /> + <location filename="../Preferences/ConfigurationDialog.py" line="920" /> + <location filename="../Preferences/ConfigurationDialog.py" line="889" /> <location filename="../Preferences/ConfigurationDialog.py" line="785" /> <location filename="../Preferences/ConfigurationDialog.py" line="670" /> <location filename="../Preferences/ConfigurationDialog.py" line="235" /> @@ -7732,7 +7732,7 @@ <translation>Visor de Log</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1104" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1111" /> <location filename="../Preferences/ConfigurationDialog.py" line="250" /> <source>MicroPython</source> <translation>MicroPython</translation> @@ -7749,8 +7749,9 @@ <translation>Red</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1111" /> - <location filename="../Preferences/ConfigurationDialog.py" line="958" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1118" /> + <location filename="../Preferences/ConfigurationDialog.py" line="965" /> + <location filename="../Preferences/ConfigurationDialog.py" line="806" /> <location filename="../Preferences/ConfigurationDialog.py" line="271" /> <source>Network Proxy</source> <translation>Proxy de Red</translation> @@ -7761,13 +7762,13 @@ <translation>Notificaciones</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="927" /> + <location filename="../Preferences/ConfigurationDialog.py" line="934" /> <location filename="../Preferences/ConfigurationDialog.py" line="285" /> <source>PDF Viewer</source> <translation>Visor de PDF</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="965" /> + <location filename="../Preferences/ConfigurationDialog.py" line="972" /> <location filename="../Preferences/ConfigurationDialog.py" line="292" /> <source>Python Package Management</source> <translation>Gestión de Packages Python</translation> @@ -7778,7 +7779,7 @@ <translation>Gestor de Plugins</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="806" /> + <location filename="../Preferences/ConfigurationDialog.py" line="813" /> <location filename="../Preferences/ConfigurationDialog.py" line="684" /> <location filename="../Preferences/ConfigurationDialog.py" line="306" /> <source>Printer</source> @@ -7795,13 +7796,13 @@ <translation>Qt</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="813" /> + <location filename="../Preferences/ConfigurationDialog.py" line="820" /> <location filename="../Preferences/ConfigurationDialog.py" line="321" /> <source>Security</source> <translation>Seguridad</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="996" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1003" /> <location filename="../Preferences/ConfigurationDialog.py" line="328" /> <source>Shell</source> <translation>Shell</translation> @@ -7817,7 +7818,7 @@ <translation>Plantillas</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="865" /> + <location filename="../Preferences/ConfigurationDialog.py" line="872" /> <location filename="../Preferences/ConfigurationDialog.py" line="343" /> <source>Tray Starter</source> <translation>Lanzador de bandeja de sistema</translation> @@ -7833,7 +7834,7 @@ <translation>Depurador</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1003" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1010" /> <location filename="../Preferences/ConfigurationDialog.py" line="698" /> <location filename="../Preferences/ConfigurationDialog.py" line="399" /> <location filename="../Preferences/ConfigurationDialog.py" line="364" /> @@ -7868,14 +7869,14 @@ <translation>Gestión de archivos</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1010" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1017" /> <location filename="../Preferences/ConfigurationDialog.py" line="712" /> <location filename="../Preferences/ConfigurationDialog.py" line="413" /> <source>Searching</source> <translation>Búsquedas</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="848" /> + <location filename="../Preferences/ConfigurationDialog.py" line="855" /> <location filename="../Preferences/ConfigurationDialog.py" line="719" /> <location filename="../Preferences/ConfigurationDialog.py" line="648" /> <location filename="../Preferences/ConfigurationDialog.py" line="420" /> @@ -7883,7 +7884,7 @@ <translation>Corrección ortográfica</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1017" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1024" /> <location filename="../Preferences/ConfigurationDialog.py" line="726" /> <location filename="../Preferences/ConfigurationDialog.py" line="427" /> <source>Style</source> @@ -7906,14 +7907,14 @@ <translation>Exportadores</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1024" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1031" /> <location filename="../Preferences/ConfigurationDialog.py" line="455" /> <source>Autocompletion</source> <translation>Autocompletar</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1045" /> - <location filename="../Preferences/ConfigurationDialog.py" line="1031" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1052" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1038" /> <location filename="../Preferences/ConfigurationDialog.py" line="483" /> <location filename="../Preferences/ConfigurationDialog.py" line="462" /> <source>QScintilla</source> @@ -7927,13 +7928,13 @@ <translation>Jedi</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1038" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1045" /> <location filename="../Preferences/ConfigurationDialog.py" line="476" /> <source>Calltips</source> <translation>Consejos de llamada (calltips)</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1052" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1059" /> <location filename="../Preferences/ConfigurationDialog.py" line="740" /> <location filename="../Preferences/ConfigurationDialog.py" line="497" /> <source>Highlighters</source> @@ -7946,21 +7947,21 @@ <translation>Asociación de tipos de archivo</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1059" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1066" /> <location filename="../Preferences/ConfigurationDialog.py" line="754" /> <location filename="../Preferences/ConfigurationDialog.py" line="511" /> <source>Styles</source> <translation>Estilos</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1066" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1073" /> <location filename="../Preferences/ConfigurationDialog.py" line="761" /> <location filename="../Preferences/ConfigurationDialog.py" line="518" /> <source>Keywords</source> <translation>Palabras clave</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1073" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1080" /> <location filename="../Preferences/ConfigurationDialog.py" line="768" /> <location filename="../Preferences/ConfigurationDialog.py" line="525" /> <source>Properties</source> @@ -7977,7 +7978,7 @@ <translation>Ayuda</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="820" /> + <location filename="../Preferences/ConfigurationDialog.py" line="827" /> <location filename="../Preferences/ConfigurationDialog.py" line="553" /> <source>Help Documentation</source> <translation>Documentación de Ayuda</translation> @@ -8004,12 +8005,12 @@ <translation>Multiproyecto</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1136" /> - <location filename="../Preferences/ConfigurationDialog.py" line="1097" /> - <location filename="../Preferences/ConfigurationDialog.py" line="989" /> - <location filename="../Preferences/ConfigurationDialog.py" line="951" /> - <location filename="../Preferences/ConfigurationDialog.py" line="920" /> - <location filename="../Preferences/ConfigurationDialog.py" line="889" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1143" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1104" /> + <location filename="../Preferences/ConfigurationDialog.py" line="996" /> + <location filename="../Preferences/ConfigurationDialog.py" line="958" /> + <location filename="../Preferences/ConfigurationDialog.py" line="927" /> + <location filename="../Preferences/ConfigurationDialog.py" line="896" /> <location filename="../Preferences/ConfigurationDialog.py" line="792" /> <location filename="../Preferences/ConfigurationDialog.py" line="677" /> <location filename="../Preferences/ConfigurationDialog.py" line="602" /> @@ -8028,47 +8029,47 @@ <translation>Navegador Web</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="827" /> + <location filename="../Preferences/ConfigurationDialog.py" line="834" /> <location filename="../Preferences/ConfigurationDialog.py" line="627" /> <source>Appearance</source> <translation>Apariencia</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="834" /> - <location filename="../Preferences/ConfigurationDialog.py" line="634" /> - <source>eric Web Browser</source> - <translation>Navegador Web de eric</translation> - </message> - <message> <location filename="../Preferences/ConfigurationDialog.py" line="841" /> + <location filename="../Preferences/ConfigurationDialog.py" line="634" /> + <source>eric Web Browser</source> + <translation>Navegador Web de eric</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationDialog.py" line="848" /> <location filename="../Preferences/ConfigurationDialog.py" line="641" /> <source>VirusTotal Interface</source> <translation>Interfaz de VirusTotal</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1228" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1235" /> <source>Enter search text...</source> <translation>Introducir texto de búsqueda...</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1303" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1310" /> <source>Preferences</source> <translation>Preferencias</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1309" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1316" /> <source>Please select an entry of the list to display the configuration page.</source> <translation>Por favor, seleccione una entrada de la lista para visualizar la página de configuración.</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1392" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1399" /> <source>Configuration Page Error</source> <translation>Error de Configuración de Página</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1393" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1400" /> <source><p>The configuration page <b>{0}</b> could not be loaded.</p></source> <translation><p>La página de configuración <b>{0}</b> no puede ser cargada.</p></translation> </message> @@ -10633,12 +10634,12 @@ <translation><p>La depuración remota está configurada pero no se ha proporcionado comando para login remoto.</p></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="1691" /> + <location filename="../Debugger/DebuggerInterfacePython.py" line="1692" /> <source>Debug Protocol Error</source> <translation>Error de Protocolo de Depuración</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="1692" /> + <location filename="../Debugger/DebuggerInterfacePython.py" line="1693" /> <source><p>The response received from the debugger backend could not be decoded. Please report this issue with the received data to the eric bugs email address.</p><p>Error: {0}</p><p>Data:<br/>{1}</p></source> <translation><p>La respuesta recibida desde el backend del depurador no se ha podido descodificar. Por favor, informar de este problema junto con los datos recibidos a la dirección de email para bugs de eric.</p><p>Error: {0}</p><p>Datos:<br/>{1}</p></translation> </message> @@ -22681,64 +22682,147 @@ </message> </context> <context> + <name>Fastexport</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="183" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="174" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="168" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="159" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="133" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="113" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="57" /> + <source>Mercurial Fastexport</source> + <translation>Mercurial Fastexport</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="58" /> + <source><p>The output file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation><p>El archivo de salida <b>{0}</b> ya existe. ¿Sobreescribirlo?</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="107" /> + <source>Cancel</source> + <translation>Cancelar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="110" /> + <source>%v/%m Changesets</source> + <translation>%v/%m Changesets</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="116" /> + <source>Exporting repository (time remaining: {0}) ...</source> + <translation>Exportando repositorio (tiempo restante: {0}) ...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="134" /> + <source><p>The repository fastexport process sent an error message.</p><p>{0}</p></source> + <translation><p>El proceso de fastexport de repositorio ha devuelto un mensaje de error.</p><p>{0}</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="160" /> + <source><p>The repository fastexport process finished successfully.</p></source> + <translation><p>El proceso de fastexport de repositorio ha terminado con éxito.</p><p>{0}</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="169" /> + <source><p>The repository fastexport process was cancelled.</p></source> + <translation><p>El proceso de fastexport de repositorio se ha cancelado.</p><p>{0}</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="175" /> + <source><p>The repository fastexport process finished with exit code <b>{0}</b>.</p></source> + <translation><p>El proceso de fastexport de repositorio ha terminado con código de salida </p><p>{0}</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="184" /> + <source><p>The repository fastexport process crashed.</p></source> + <translation><p>El proceso de fastexport se ha detenido.</p><p>{0}</p></translation> + </message> + </context> + <context> + <name>FastexportProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="37" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="35" /> + <source>Export to git</source> + <translation>Exportar a git</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="44" /> + <source>Export the repository as git fast-import stream.</source> + <translation>Exportar el repositorio como un stream de git fast-import.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="47" /> + <source><b>Export to git</b><p>This exports the repository as a git fast-import stream.</p></source> + <translation><b>Exportar a git</b><p>Esto exporta el repositorio como un stream de git fast-import.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="79" /> + <source>Fastexport</source> + <translation>Fastexport</translation> + </message> + </context> + <context> <name>FeaturePermissionBar</name> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="48" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="50" /> <source>{0} wants to use your position.</source> <translation>{0} desea utilizar la posición.</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="51" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="53" /> <source>{0} wants to use your microphone.</source> <translation>{0} desea utilizar el micrófono.</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="54" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="56" /> <source>{0} wants to use your camera.</source> <translation>{0} desea utilizar la cámara.</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="57" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="59" /> <source>{0} wants to use your microphone and camera.</source> <translation>{0} desea utilizar el micrófono y la cámara.</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="60" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="62" /> <source>{0} wants to lock your mouse.</source> <translation>{0} desea bloquear el ratón.</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="61" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="63" /> <source>{0} wants to capture video of your screen.</source> <translation>{0} desea capturar un vídeo de pantalla.</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="64" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="66" /> <source>{0} wants to capture audio and video of your screen.</source> <translation>{0} desea capturar audio y un vídeo de pantalla.</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="67" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="69" /> <source>{0} wants to use desktop notifications.</source> <translation>{0} desea utilizar notificaciones de escritorio.</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="92" /> - <source>Remember</source> - <translation>Recordar</translation> - </message> - <message> <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="94" /> + <source>Remember</source> + <translation>Recordar</translation> + </message> + <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="96" /> <source>Allow</source> <translation>Permitir</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="95" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="97" /> <source>Deny</source> <translation>Denegar</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="120" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="122" /> <source>{0} wants to use an unknown feature.</source> <translation>{0} desea utilizar una característica desconocida.</translation> </message> @@ -22746,80 +22830,106 @@ <context> <name>FeaturePermissionsDialog</name> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="161" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="143" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="127" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="109" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="93" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="79" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="65" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="49" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="208" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="190" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="170" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="152" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="136" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="118" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="102" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="88" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="74" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="58" /> <source>Host</source> <translation>Host</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="162" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="144" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="128" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="110" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="94" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="80" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="66" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="50" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="209" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="191" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="171" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="153" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="137" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="119" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="103" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="89" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="75" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="59" /> <source>Permission</source> <translation>Permiso</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="54" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="63" /> <source>Notifications</source> <translation>Notificaciones</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="68" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="77" /> <source>Geolocation</source> <translation>Geolocalización</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="82" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="91" /> <source>Microphone</source> <translation>Micrófono</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="96" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="105" /> <source>Camera</source> <translation>Cámara</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="114" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="123" /> <source>Microphone && Camera</source> <translation>Micrófono && Cámara</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="130" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="139" /> <source>Mouse Lock</source> <translation>Bloquear Ratón</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="148" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="157" /> <source>Desktop Video</source> <translation>Vídeo del Escritorio</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="166" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="175" /> <source>Desktop Audio && Video</source> <translation>Audio && Vídeo del Escritorio</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="181" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="195" /> + <source>Clipboard</source> + <translation>Portapapeles</translation> + </message> + <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="213" /> + <source>Local Fonts</source> + <translation>Fuentes Locales</translation> + </message> + <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="296" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="253" /> <source>Allow</source> <translation>Permitir</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="182" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="297" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="254" /> <source>Deny</source> <translation>Denegar</translation> </message> <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="255" /> + <source>Always Ask</source> + <translation>Preguntar Siempre</translation> + </message> + <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="256" /> + <source>Invalid</source> + <translation>No válido</translation> + </message> + <message> <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.ui" line="0" /> <source>HTML5 Feature Permissions</source> <translation>Permisos de Características HTML5</translation> @@ -24691,23 +24801,23 @@ <translation>{0} ({1})</translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="750" /> + <location filename="../UI/FindFileWidget.py" line="749" /> <source>Invalid search expression</source> <translation>Expresión de búsqueda no válida</translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="751" /> + <location filename="../UI/FindFileWidget.py" line="750" /> <source><p>The search expression is not valid.</p><p>Error: {0}</p></source> <translation><p>La expresión de búsqueda no es válida.</p><p>Error:{0}</p></translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="878" /> + <location filename="../UI/FindFileWidget.py" line="877" /> <source>{0} / {1}</source> <comment>occurrences / files</comment> <translation>{0} / {1}</translation> </message> <message numerus="yes"> - <location filename="../UI/FindFileWidget.py" line="881" /> + <location filename="../UI/FindFileWidget.py" line="880" /> <source>%n occurrence(s)</source> <translation> <numerusform>%n occurrencia</numerusform> @@ -24715,7 +24825,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../UI/FindFileWidget.py" line="882" /> + <location filename="../UI/FindFileWidget.py" line="881" /> <source>%n file(s)</source> <translation> <numerusform>%n archivo</numerusform> @@ -24723,44 +24833,44 @@ </translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1081" /> - <location filename="../UI/FindFileWidget.py" line="1056" /> - <location filename="../UI/FindFileWidget.py" line="1042" /> + <location filename="../UI/FindFileWidget.py" line="1080" /> + <location filename="../UI/FindFileWidget.py" line="1055" /> + <location filename="../UI/FindFileWidget.py" line="1041" /> <source>Replace in Files</source> <translation>Reemplazar en Archivos</translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1043" /> + <location filename="../UI/FindFileWidget.py" line="1042" /> <source><p>Could not read the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation><p>No se pudo leer el archivo <b>{0}</b>. Omitiéndolo.</p><p>Razón: {1}</p></translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1057" /> + <location filename="../UI/FindFileWidget.py" line="1056" /> <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>Los hash actual y original del archivos <b>{0}</b> son distintos. Omitiendo.</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p></translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1082" /> + <location filename="../UI/FindFileWidget.py" line="1081" /> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation><p>No se pudo guardar el archivo <b>{0}</b>. Omitiéndolo.</p><p>Razón: {1}</p></translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1111" /> + <location filename="../UI/FindFileWidget.py" line="1110" /> <source>Open</source> <translation>Abrir</translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1113" /> + <location filename="../UI/FindFileWidget.py" line="1112" /> <source>Copy Path to Clipboard</source> <translation>Copiar Ruta al Portapapeles</translation> </message> <message> + <location filename="../UI/FindFileWidget.py" line="1116" /> + <source>Select All</source> + <translation>Seleccionar todo</translation> + </message> + <message> <location filename="../UI/FindFileWidget.py" line="1117" /> - <source>Select All</source> - <translation>Seleccionar todo</translation> - </message> - <message> - <location filename="../UI/FindFileWidget.py" line="1118" /> <source>Deselect All</source> <translation>Deseleccionar Todo</translation> </message> @@ -26954,37 +27064,37 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="91" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="94" /> <source>Additional Output</source> <translation>Output Adicional</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="110" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="113" /> <source>Process canceled.</source> <translation>Proceso cancelado.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="124" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="127" /> <source>Process finished successfully.</source> <translation>Proceso terminado con éxito.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="126" /> - <source>Process crashed.</source> - <translation>El proceso ha fallado.</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="129" /> + <source>Process crashed.</source> + <translation>El proceso ha fallado.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="132" /> <source>Process finished with exit code {0}</source> <translation>El proceso ha terminado con código de salida {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="195" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="198" /> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="196" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="199" /> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> @@ -31241,7 +31351,7 @@ <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="178" /> <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="159" /> <source>not tracked</source> - <translation>sin seguimiento</translation> + <translation>no rastreados</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitStatusDialog.py" line="177" /> @@ -35365,456 +35475,456 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="303" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="309" /> <source>Create project repository</source> <translation>Crear repositorio del proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="304" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="310" /> <source>The project repository could not be created.</source> <translation>No se ha podido crear el repositorio del proyecto.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="338" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="344" /> <source>Creating Mercurial repository</source> <translation>Creando repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="359" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="365" /> <source>Initial commit to Mercurial repository</source> <translation>Commit inicial al repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="405" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="411" /> <source>Cloning project from a Mercurial repository</source> <translation>Clonando proyecto desde un repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="516" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="522" /> <source>Commit Changes</source> <translation>Hacer Commit de Cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="517" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="523" /> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation>La operación de commit afecta a archivos que tienen cambios sin guardar. ¿Continuar con la operación de commit?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="580" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="586" /> <source>Committing changes to Mercurial repository</source> <translation>Haciendo commit de cambios al repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="679" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="685" /> <source>Synchronizing with the Mercurial repository</source> <translation>Sincronizando con el repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="719" /> <source>Adding files/directories to the Mercurial repository</source> <translation>Añadiendo archivos/directorios al repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="774" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="780" /> <source>Removing files/directories from the Mercurial repository</source> <translation>Eliminando archivos/directorios del repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="829" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="835" /> <source>Renaming {0}</source> <translation>Renombrando {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="964" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="970" /> <source>Tagging in the Mercurial repository</source> <translation>Haciendo tag en el repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1011" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1000" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1017" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006" /> <source>Revert changes</source> <translation>Revertir cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1001" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1007" /> <source>Do you really want to revert all changes to these files or directories?</source> <translation>¿Realmente desea revertir todos los cambios a estos archivos o directorios?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1012" /> - <source>Do you really want to revert all changes of the project?</source> - <translation>¿Realmente desea revertir todos los cambios del proyecto?</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1018" /> + <source>Do you really want to revert all changes of the project?</source> + <translation>¿Realmente desea revertir todos los cambios del proyecto?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1024" /> <source>Reverting changes</source> <translation>Revirtiendo cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1064" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1070" /> <source>Merging</source> <translation>Haciendo un merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1095" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1109" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101" /> <source>Re-Merge</source> <translation>Re-Merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1102" /> <source>Do you really want to re-merge these files or directories?</source> <translation>¿Desea realmente hacer un re-merge de estos archivos o directorios?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1104" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1110" /> <source>Do you really want to re-merge the project?</source> <translation>¿Desea realmente hacer un re-merge del proyecto?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1114" /> <source>Re-Merging</source> <translation>Aplicando Re-Merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1131" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1137" /> <source>Current branch tip</source> <translation>Tip branch actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1314" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1320" /> <source>Mercurial command</source> <translation>Comando de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1492" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1498" /> <source>Copying {0}</source> <translation>Copiando {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1758" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1746" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1764" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1752" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743" /> <source>Mercurial Side-by-Side Difference</source> <translation>Diferencia Lado a Lado Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1759" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1765" /> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>El archivo <b>{0}</b> no se ha podido leer.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2457" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2446" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2436" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1835" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2455" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844" /> <source>Apply changegroups</source> <translation>Aplicar changegroups</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1838" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1847" /> <source>Pulling from a remote Mercurial repository</source> <translation>Haciendo pull de un repositorio remoto Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1884" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1893" /> <source>Pushing to a remote Mercurial repository</source> <translation>Haciendo push a un repositorio remoto Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2027" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2036" /> <source>Marking as 'unresolved'</source> <translation>Marcando como 'unresolved'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2029" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038" /> <source>Marking as 'resolved'</source> <translation>Marcando como 'resolved'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2051" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060" /> <source>Aborting uncommitted merge</source> <translation>Abortando merge sin commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2084" /> <source>Creating branch in the Mercurial repository</source> <translation>Creando branch en el repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086" /> - <source>Created new branch <{0}>.</source> - <translation>Creada nueva branch <{0}>.</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2095" /> + <source>Created new branch <{0}>.</source> + <translation>Creada nueva branch <{0}>.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2104" /> <source>Showing current branch</source> <translation>Mostrando la branch actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2184" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193" /> <source>Verifying the integrity of the Mercurial repository</source> <translation>Verificando la integridad del repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2200" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209" /> <source>Showing the combined configuration settings</source> <translation>Mostrando los ajustes de configuración combinados</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2224" /> <source>Showing aliases for remote repositories</source> <translation>Mostrando alias para repositorios remotos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2230" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239" /> <source>Recovering from interrupted transaction</source> <translation>Recuperando de transacción interrumpida</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254" /> <source>Identifying project directory</source> <translation>Identificando directorio de proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2291" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2300" /> <source>Create .hgignore file</source> <translation>Crear archivo .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2292" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301" /> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>El archivo <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2395" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2369" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2351" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2404" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2378" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2360" /> <source>Create changegroup</source> <translation>Crear changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2353" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362" /> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Archivos Changegroup de Mercurial (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2370" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2379" /> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>El archivo changegroup de Mercurial <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2409" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2418" /> <source>Preview changegroup</source> <translation>Previsualizar changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2438" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2411" /> - <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> - <translation>Archivos Changegroup de Mercurial (*.hg);;Todos los Archivos (*)</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2447" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2420" /> + <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> + <translation>Archivos Changegroup de Mercurial (*.hg);;Todos los Archivos (*)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2456" /> <source>Shall the working directory be updated?</source> <translation>¿Debe ser actualizado el directorio de trabajo?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2479" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2488" /> <source>Bisect subcommand ({0}) invalid.</source> <translation>Subcomando bisect ({0}) inválido.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2501" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2510" /> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2527" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2536" /> <source>Removing files from the Mercurial repository only</source> <translation>Eliminando archivos unicamente del repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2576" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2557" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2585" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2566" /> <source>Backing out changeset</source> <translation>Haciendo respaldo de changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2558" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2567" /> <source>No revision given. Aborting...</source> <translation>No se ha proporcionado revisión. Abortando...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2587" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2602" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2596" /> <source>Rollback last transaction</source> <translation>Hacer Rollback de la última transacción</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2588" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2597" /> <source>Are you sure you want to rollback the last transaction?</source> <translation>¿Está seguro de que quiere aplicar un rollback a la última transacción?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2657" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2666" /> <source>Import Patch</source> <translation>Importar Patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2707" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2716" /> <source>Export Patches</source> <translation>Exportar Patches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2749" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2758" /> <source>Change Phase</source> <translation>Cambiar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2804" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813" /> <source>Copy Changesets</source> <translation>Copiar Changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2843" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2852" /> <source>Copy Changesets (Continue)</source> <translation>Copiar Changesets (Continuar)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2853" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2862" /> <source>Copy Changesets (Stop)</source> <translation>Copiar Changesets (Stop)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2863" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2872" /> <source>Copy Changesets (Abort)</source> <translation>Copiar Changesets (Abortar)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2887" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2896" /> <source>Create Unversioned Archive</source> <translation>Crear Archivo Sin Versionar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2902" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2911" /> <source>Delete All Backups</source> <translation>Borrar todas las Copias de Seguridad</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2903" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2912" /> <source><p>Do you really want to delete all backup bundles stored in the backup area?<br/><b>{0}</b></p></source> <translation><p>¿Desea realmente borrar todos los bundles de copia de seguridad almacenados en el área de copias de seguridad?<br/><b>{0}</b></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2994" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2974" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2963" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2983" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2972" /> <source>Add Sub-repository</source> <translation>Añadir Sub-repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3033" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2964" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3042" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2973" /> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation><p>No se ha podido leer el archivo .hgsub de sub-repositorios.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2975" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2984" /> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation><p>El archivo .hgsub de sub-repositorios ya contiene una entrada.</p><p>Abortando...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3051" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3060" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3004" /> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation><p>No se ha podido escribir al archivo .hgsub de sub-repositorios.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3050" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3032" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3018" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3059" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3027" /> <source>Remove Sub-repositories</source> <translation>Eliminar Sub-repositorios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3019" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3028" /> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation><p>El archivo de subrepositorios .hgsub no existe. Abortando...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3296" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3138" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3147" /> <source>Mercurial Command Server</source> <translation>Servidor de Comandos de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3139" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3148" /> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation><p>El Servidor de Comandos de Mercurial no ha podido reiniciarse.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3297" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3321" /> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation><p>El Servidor de Comandos de Mercurial no ha podido iniciarse.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3420" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3444" /> <source>Mercurial Bookmark</source> <translation>Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3437" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3461" /> <source>Delete Bookmark</source> <translation>Borrar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3438" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3462" /> <source>Select the bookmark to be deleted:</source> <translation>Seleccionar el marcador a borrar:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3449" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3473" /> <source>Delete Mercurial Bookmark</source> <translation>Borrar Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3476" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3500" /> <source>Rename Mercurial Bookmark</source> <translation>Renombrar Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3518" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3542" /> <source>Move Mercurial Bookmark</source> <translation>Mover Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3600" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3624" /> <source>Pull Bookmark</source> <translation>Pull de Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3601" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3625" /> <source>Select the bookmark to be pulled:</source> <translation>Seleccinar el marcador sobre el que hacer pull:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3613" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3637" /> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>Haciendo pull de marcador desde un repositorio Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3641" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3665" /> <source>Push Bookmark</source> <translation>Push de Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3642" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3666" /> <source>Select the bookmark to be push:</source> <translation>Seleccinar el marcador sobre el que hacer push:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3657" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3681" /> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Haciendo push de marcador desde un repositorio Mercurial remoto</translation> </message> @@ -36660,42 +36770,42 @@ <context> <name>HgClient</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="98" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="100" /> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="147" /> - <source>Did not receive the 'hello' message.</source> - <translation>No se ha recibido el mensaje 'hello'.</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="149" /> + <source>Did not receive the 'hello' message.</source> + <translation>No se ha recibido el mensaje 'hello'.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="151" /> <source>Received data on unexpected channel.</source> <translation>Datos recibidos en canal no esperado.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="154" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="156" /> <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> <translation>Mensaje 'hello' erróneo, se esperaba 'capabilities' pero se obtuvo '{0}'.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="159" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="161" /> <source>'capabilities' message did not contain any capability.</source> <translation>El mensaje 'capabilities' no contiene ninguna capacidad.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="168" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="170" /> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation>Mensaje 'hello' erróneo, se esperaba 'encoding' pero se obtuvo '{0}'.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="173" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="175" /> <source>'encoding' message did not contain any encoding.</source> <translation>El mensaje 'encoding' no contiene ninguna codificación.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="385" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="387" /> <source>For message see output dialog.</source> <translation>Para mensaje ver el diálogo de output.</translation> </message> @@ -37063,6 +37173,11 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="0" /> + <source>%v/%m</source> + <translation>%v/%m</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="0" /> <source>Errors</source> <translation>Errores</translation> </message> @@ -37106,6 +37221,11 @@ <source>Alt+P</source> <translation>Alt+P</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="211" /> + <source>Time remaining: {0}</source> + <translation>Tiempo restante: {0}</translation> + </message> </context> <context> <name>HgDiffDialog</name> @@ -37299,6 +37419,69 @@ </message> </context> <context> + <name>HgFastexportConfigDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>fastexport Configuration</source> + <translation>Configuración de fastexport</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the path of the file for the exported marks.</source> + <translation>Introducir la ruta del archivo para las marcas exportadas.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the path of the output file.</source> + <translation>Introducir la ruta del archivo de salida.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Revisions:</source> + <translation>Revisiones:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the path of the file containing already exported marks.</source> + <translation>Introducir la ruta del archivo que contiene marcas ya exportadas.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Author Map:</source> + <translation>Mapa de Autor:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Import Marks:</source> + <translation>Marcas de Importación:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Export Marks:</source> + <translation>Marcas de Exportación:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Output File:</source> + <translation>Archivo de salida:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the revisions, tags or branches to be exported (separated by comma).</source> + <translation>Introducir las revisiones, tags o ramas (branches) a exportar (separadas por comas).</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the path of the author map file.</source> + <translation>Introducir la ruta del archivo de mapa de autor.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.py" line="42" /> + <source>Text Files (*.txt);;All Files (*)</source> + <translation>Archivos de Texto (*.txt);;Todos los Archivos (*)</translation> + </message> + </context> + <context> <name>HgGpgSignDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="0" /> @@ -38110,7 +38293,7 @@ <translation>Ver</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3049" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3063" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298" /> <source>Select Branches</source> <translation>Seleccionar Branches</translation> @@ -38151,7 +38334,7 @@ <translation>Seleccionar las branchse a mostrar de un listado de todas las branches cerradas y actualizar la pantalla</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2218" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2227" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> <source>Copy Changesets</source> <translation>Copiar Changesets</translation> @@ -38209,8 +38392,8 @@ <translation>Cerrar las heads seleccionadas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2312" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2295" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2321" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2304" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="387" /> <source>Switch</source> <translation>Hacer switch</translation> @@ -38241,264 +38424,271 @@ <translation>Mover marcador a la revisión seleccionada</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2430" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1622" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="415" /> - <source>Pull Changes</source> - <translation>Hacer Pull de Cambios</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="418" /> - <source>Pull changes from a remote repository</source> - <translation>Hacer pull de cambios desde un repositorio remoto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="420" /> + <source>Pull Selected Changes</source> + <translation>Hacer Pull de Cambios Seleccionados</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="419" /> + <source>Pull selected changes from a remote repository</source> + <translation>Hacer pull de los cambios seleccionados desde un repositorio remoto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="423" /> + <source>Pull All Changes</source> + <translation>Hacer Push de Todos los Cambios</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="427" /> + <source>Pull all changes from a remote repository</source> + <translation>Hacer pull de todos los cambios desde un repositorio remoto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="430" /> <source>Pull Large Files</source> <translation>Hacer pull de archivos grandes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="422" /> - <source>Pull large files for selected revisions</source> - <translation>Hacer pull de archivos grandes para revisiones seleccionadas</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="428" /> - <source>Push Selected Changes</source> - <translation>Hacer Pull de Cambios Seleccionados</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="432" /> - <source>Push changes of the selected changeset and its ancestors to a remote repository</source> - <translation>Hacer push de cambios del changeset seleccionado y sus ancestores a un repositorio remoto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="439" /> - <source>Push All Changes</source> - <translation>Hacer Push de Todos los Cambios</translation> + <source>Pull large files for selected revisions</source> + <translation>Hacer pull de archivos grandes para revisiones seleccionadas</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="438" /> + <source>Push Selected Changes</source> + <translation>Hacer Pull de Cambios Seleccionados</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="442" /> - <source>Push all changes to a remote repository</source> - <translation>Hacer push de todos los cambios a un repositorio remoto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="448" /> - <source>Create Changegroup</source> - <translation>Crear Changegroup</translation> + <source>Push changes of the selected changeset and its ancestors to a remote repository</source> + <translation>Hacer push de cambios del changeset seleccionado y sus ancestores a un repositorio remoto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="449" /> + <source>Push All Changes</source> + <translation>Hacer Push de Todos los Cambios</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="452" /> + <source>Push all changes to a remote repository</source> + <translation>Hacer push de todos los cambios a un repositorio remoto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="458" /> + <source>Create Changegroup</source> + <translation>Crear Changegroup</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="462" /> <source>Create a changegroup file containing the selected changesets</source> <translation>Crear un archivo de changegroup conteniendo los changesets seleccionados</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="455" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="465" /> <source><b>Create Changegroup</b> <p>This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.</p></source> <translation><b>Crear Changegroup</b> <p>Esto crea un archivo de changegroup que contiene las revisiones seleccionadas. Si no se han seleccionado revisiones, se incluirán todos los changesets. Si se ha seleccionado una revisión, se tomará como revisión base. En cualquier otro lugar, la revisión más baja se usará como revisión base y todas las otras revisiones se incluirán en el archivo. Si el diálogo muestra changesets salientes, todos los changesets seleccionados se incluirán en el archivo.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2569" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="468" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2583" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="478" /> <source>Apply Changegroup</source> <translation>Aplicar Changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="472" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="482" /> <source>Apply the currently viewed changegroup file</source> <translation>Aplicar el archivo de changegroup mostrado actualmente</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="489" /> <source>Sign Revisions</source> <translation>Firmar Revisiones</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="483" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="493" /> <source>Add a signature for the selected revisions</source> <translation>Añadir una firma para las revisiones seleccionadas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="487" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="497" /> <source>Verify Signatures</source> <translation>Verificar Firmas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="491" /> - <source>Verify all signatures there may be for the selected revision</source> - <translation>Verificar todas las firmas que puede haber para la revisión seleccionada</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2476" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498" /> - <source>Strip Changesets</source> - <translation>Hacer strip de Changesets</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="501" /> + <source>Verify all signatures there may be for the selected revision</source> + <translation>Verificar todas las firmas que puede haber para la revisión seleccionada</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="508" /> + <source>Strip Changesets</source> + <translation>Hacer strip de Changesets</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="511" /> <source>Strip changesets from a repository</source> <translation>Hacer strip de changesets desde un repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="506" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="516" /> <source>Select All Entries</source> <translation>Seleccionar Todas las Entradas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="509" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="519" /> <source>Deselect All Entries</source> <translation>Quitar Selección de Todas las Entradas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="958" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="934" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="911" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="885" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="968" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="944" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="921" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="895" /> <source>Mercurial Error</source> <translation>Error de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1266" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1276" /> <source>{0} (large file)</source> <translation>{0} (archivo grande)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1532" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1542" /> <source>Side-by-Side Diff to Parent {0}</source> <translation>Mostrar Diff lado a lado con el Parent {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1543" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1553" /> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation><a href="sbsdiff:{0}_{1}">Comparar lado a lado</a></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1701" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1620" /> - <source>Pull Selected Changes</source> - <translation>Hacer Pull de Cambios Seleccionados</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2570" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2477" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2431" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2313" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2219" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2584" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2491" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2322" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2228" /> <source>The project should be reread. Do this now?</source> <translation>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2296" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2305" /> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation>Seleccionar marcador al que cambiar (dejar vacío para usar revisión):</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2341" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2350" /> <source>Define Bookmark</source> <translation>Definir Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2342" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2351" /> <source>Enter bookmark name for changeset "{0}":</source> <translation>Introducir nombre de marcador para el changeset "{0}":</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2371" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2380" /> <source>Move Bookmark</source> <translation>Mover Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2372" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2381" /> <source>Select the bookmark to be moved to changeset '{0}':</source> <translation>Seleccionar el marcador a mover al changeset "{0}":</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2444" /> + <source>Pull Changes</source> + <translation>Hacer Pull de Cambios</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2727" /> <source>Find Commit</source> <translation>Buscar Commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2714" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728" /> <source>'{0}' was not found.</source> <translation>'{0}' no se ha encontrado.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2774" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2788" /> <source>Generating differences ...</source> <translation>Generando diferencias ...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2775" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2789" /> <source>Differences</source> <translation>Diferencias</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2794" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2808" /> <source>No differences available. Get some more log entries.</source> <translation>No hay diferencias disponibles. Obtener más entradas de log.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2796" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2810" /> <source>No differences available.</source> <translation>No hay diferencias disponibles.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2807" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2821" /> <source>Differences to Parent {0}</source> <translation>Diferencias con el Parent {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2823" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2837" /> <source>Diff to Parent {0}{1}</source> <translation>Diff con el Parent {0}{1}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2846" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2860" /> <source>There is no difference.</source> <translation>No hay ninguna diferencia.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2999" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2983" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2965" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3013" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2997" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2979" /> <source>Save Diff</source> <translation>Guardar Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2967" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2981" /> <source>Patch Files (*.diff)</source> <translation>Archivos de Parche (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2984" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2998" /> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>El archivo de parche <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3000" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3014" /> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation><p>El archivo de parche <b>{0}</b> no puede ser guardado.<br />Causa: {1}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3031" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3045" /> <source>closed</source> <translation>cerrada</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3032" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3046" /> <source>inactive</source> <translation>inactiva</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3041" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3055" /> <source>{0} ({1})</source> <translation>{0} ({1})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3050" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3064" /> <source>Select the branches to be shown (none for 'All'):</source> <translation>Seleccionar las branches a mostrar (ninguna para mostrar 'Todas'):</translation> </message> @@ -39013,208 +39203,213 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="282" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="309" /> + <source>Other Functions</source> + <translation>Otras Funciones</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="335" /> <source>Extensions</source> <translation>Extensiones</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="718" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="604" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="556" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="451" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="308" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="774" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="659" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="611" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="505" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="361" /> <source>Version Control</source> <translation>Control de Versiones</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="734" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="620" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="467" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="324" /> - <source>Commit changes to repository...</source> - <translation>Hacer commit de los cambios al repositorio...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="742" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="628" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="475" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="332" /> - <source>Add to repository</source> - <translation>Añadir al repositorio</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="748" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="481" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="338" /> - <source>Remove from repository (and disk)</source> - <translation>Eliminar del repositorio (y del disco)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1012" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="999" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="487" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="344" /> - <source>Remove from repository only</source> - <translation>Eliminar solamente del repositorio</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="639" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="349" /> - <source>Copy</source> - <translation>Copiar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="641" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="351" /> - <source>Move</source> - <translation>Mover</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="646" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="356" /> - <source>Show log browser</source> - <translation>Mostrar navegador de log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="755" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="653" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="494" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="363" /> - <source>Show status</source> - <translation>Mostrar estado</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="762" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="660" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="501" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="370" /> - <source>Show differences</source> - <translation>Mostrar diferencias</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="376" /> - <source>Show differences side-by-side</source> - <translation>Mostrar diferencias lado a lado</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="768" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="666" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="507" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="382" /> - <source>Show differences (extended)</source> - <translation>Mostrar diferencias (extendido)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="388" /> - <source>Show differences side-by-side (extended)</source> - <translation>Mostrar diferencias lado a lado (extendido)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="394" /> - <source>Show annotated file</source> - <translation>Mostrar archivo anotado</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="398" /> - <source>Show annotated file with skip list</source> - <translation>Mostrar archivo anotado con lista de omitidos</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="402" /> - <source>Create skip list file</source> - <translation>Crear archivo de lista de omitidos</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="775" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="673" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="514" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="408" /> - <source>Revert changes</source> - <translation>Revertir cambios</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="779" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="677" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="518" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="412" /> - <source>Conflicts resolved</source> - <translation>Conflictos resueltos</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="781" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="679" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="520" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="414" /> - <source>Conflicts unresolved</source> - <translation>Conflictos sin resolver</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="783" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="681" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="522" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="416" /> - <source>Re-Merge</source> - <translation>Re-Merge</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="787" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="685" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="571" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="526" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="420" /> - <source>Select all local file entries</source> - <translation>Seleccionar todas las entradas de archivo locales</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="790" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="688" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="574" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="529" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="423" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="675" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="521" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="377" /> + <source>Commit changes to repository...</source> + <translation>Hacer commit de los cambios al repositorio...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="799" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="684" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="530" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="386" /> + <source>Add to repository</source> + <translation>Añadir al repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="805" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="690" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="536" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="392" /> + <source>Remove from repository (and disk)</source> + <translation>Eliminar del repositorio (y del disco)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1069" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1056" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="542" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="398" /> + <source>Remove from repository only</source> + <translation>Eliminar solamente del repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="695" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="403" /> + <source>Copy</source> + <translation>Copiar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="697" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="405" /> + <source>Move</source> + <translation>Mover</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="702" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="410" /> + <source>Show log browser</source> + <translation>Mostrar navegador de log</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="812" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="709" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="549" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="417" /> + <source>Show status</source> + <translation>Mostrar estado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="819" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="716" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="556" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="424" /> + <source>Show differences</source> + <translation>Mostrar diferencias</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="430" /> + <source>Show differences side-by-side</source> + <translation>Mostrar diferencias lado a lado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="825" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="722" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="562" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="436" /> + <source>Show differences (extended)</source> + <translation>Mostrar diferencias (extendido)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="442" /> + <source>Show differences side-by-side (extended)</source> + <translation>Mostrar diferencias lado a lado (extendido)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="448" /> + <source>Show annotated file</source> + <translation>Mostrar archivo anotado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="452" /> + <source>Show annotated file with skip list</source> + <translation>Mostrar archivo anotado con lista de omitidos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="456" /> + <source>Create skip list file</source> + <translation>Crear archivo de lista de omitidos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="832" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="729" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="569" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="462" /> + <source>Revert changes</source> + <translation>Revertir cambios</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="836" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="733" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="573" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="466" /> + <source>Conflicts resolved</source> + <translation>Conflictos resueltos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="735" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="575" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="468" /> + <source>Conflicts unresolved</source> + <translation>Conflictos sin resolver</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="840" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="737" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="577" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="470" /> + <source>Re-Merge</source> + <translation>Re-Merge</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="844" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="741" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="581" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="474" /> + <source>Select all local file entries</source> + <translation>Seleccionar todas las entradas de archivo locales</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="847" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="744" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="629" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="584" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="477" /> <source>Select all versioned file entries</source> <translation>Seleccionar todas las entradas de archivo versionadas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="793" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="691" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="577" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="532" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="426" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="850" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="747" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="632" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="587" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="480" /> <source>Select all local directory entries</source> <translation>Seleccionar todas las entradas de directorio locales</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="797" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="695" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="581" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="536" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="430" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="854" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="751" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="591" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="484" /> <source>Select all versioned directory entries</source> <translation>Seleccionar todas las entradas de directorio versionadas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="801" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="699" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="585" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="540" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="434" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="858" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="755" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="640" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="595" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="488" /> <source>Configure...</source> <translation>Configurar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="916" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="973" /> <source>Create {0} file</source> <translation>Crear archivo {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="917" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="974" /> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>El archivo <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1013" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1000" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1070" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1057" /> <source>Do you really want to remove these files from the repository?</source> <translation>¿Realmente quiere eliminar estos archivos del repositorio?</translation> </message> @@ -39222,1513 +39417,1518 @@ <context> <name>HgProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="126" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="135" /> <source>New from repository</source> <translation>Nuevo desde repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="128" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="137" /> <source>&New from repository...</source> <translation>&Nuevo desde repositorio...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="135" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="144" /> <source>Create (clone) a new project from a Mercurial repository</source> <translation>Crear (clonar) un nuevo proyecto desde un repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="138" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="147" /> <source><b>New from repository</b><p>This creates (clones) a new local project from a Mercurial repository.</p></source> <translation><b>Nuevo desde repositorio</b><p>Crea (clona) un nuevo proyecto local desde un repositorio Mercurial.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="150" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="148" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="159" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="157" /> <source>Show incoming log</source> <translation>Mostrar log entrante</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="156" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="165" /> <source>Show the log of incoming changes</source> <translation>Mostrar el log de los cambios entrantes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="158" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="167" /> <source><b>Show incoming log</b><p>This shows the log of changes coming into the repository.</p></source> <translation><b>Mostrar log entrante</b><p>Muestra el log de cambios entrantes en el repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="170" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="168" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="179" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="177" /> <source>Pull changes</source> <translation>Hacer pull de cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="176" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="185" /> <source>Pull changes from a remote repository</source> <translation>Hacer pull de cambios desde un repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="178" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="187" /> <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository.</p></source> <translation><b>Hacer pull de cambios</b><p>Hace un pull de cambios desde un repositorio remoto al repositorio local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="188" /> - <source>Update from repository</source> - <translation>Hacer update desde repositorio</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="190" /> - <source>&Update from repository</source> - <translation>Hacer &update desde repositorio</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="197" /> + <source>Update from repository</source> + <translation>Hacer update desde repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="199" /> + <source>&Update from repository</source> + <translation>Hacer &update desde repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="206" /> <source>Update the local project from the Mercurial repository</source> <translation>Actualizar el proyecto local desde el repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="200" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="209" /> <source><b>Update from repository</b><p>This updates the local project from the Mercurial repository.</p></source> <translation><b>Hacer update desde repositorio</b><p>Actualiza el proyecto local desde el repositorio Mercurial.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="210" /> - <source>Commit changes to repository</source> - <translation>Hacer commit de los cambios al repositorio</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="212" /> - <source>&Commit changes to repository...</source> - <translation>Hacer &commit de los cambios al repositorio...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="219" /> + <source>Commit changes to repository</source> + <translation>Hacer commit de los cambios al repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="221" /> + <source>&Commit changes to repository...</source> + <translation>Hacer &commit de los cambios al repositorio...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="228" /> <source>Commit changes to the local project to the Mercurial repository</source> <translation>Hacer commit de los cambios en el proyecto local al repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="231" /> <source><b>Commit changes to repository</b><p>This commits changes to the local project to the Mercurial repository.</p></source> <translation><b>Hacer commit de los cambios al repositorio</b><p>Envía los cambios del proyecto local al repositorio Mercurial.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="234" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="232" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="243" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="241" /> <source>Show outgoing log</source> <translation>Mostrar log saliente</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="240" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="249" /> <source>Show the log of outgoing changes</source> <translation>Mostrar el log de los cambios salientes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="242" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251" /> <source><b>Show outgoing log</b><p>This shows the log of changes outgoing out of the repository.</p></source> <translation><b>Mostrar log saliente</b><p>Muestra el log de cambios salientes en el repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="254" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="252" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261" /> <source>Push changes</source> <translation>Hacer push de cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="260" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="269" /> <source>Push changes to a remote repository</source> <translation>Hacer push de cambios hacia un repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="262" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271" /> <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> <translation><b>Hacer push de cambios</b><p>Hace un push de cambios desde un repositorio local a un repositorio remoto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="274" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="272" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281" /> <source>Push changes (force)</source> <translation>Hacer push de cambios (force)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="290" /> <source>Push changes to a remote repository with force option</source> <translation>Se hace un push de los cambios a un repositorio remoto con la opción force</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="284" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293" /> <source><b>Push changes (force)</b><p>This pushes changes from the local repository to a remote repository using the 'force' option.</p></source> <translation><b>Hacer push de cambios (force)</b><p>Se hace un push de los cambios desde el repositorio local a un repositorio remoto utilizando la opción 'force'.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="294" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="303" /> <source>Export from repository</source> <translation>Exportar desde repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="296" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="305" /> <source>&Export from repository...</source> <translation>&Exportar desde repositorio...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="302" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="311" /> <source>Export a project from the repository</source> <translation>Exportar un proyecto desde el repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="313" /> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation><b>Exportar desde repositorio</b><p>Exporta un proyecto desde el repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="313" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="324" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322" /> <source>Show log browser</source> <translation>Mostrar navegador de log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="331" /> <source>Show a dialog to browse the log of the local project</source> <translation>Mostrar un diálogo para navegar el log del proyecto local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="334" /> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation><b>Mostrar navegador de log</b><p>Muestra un diálogo para navegar el log del proyecto local. Al principio se muestra un número limitado de entradas. Se pueden recuperar más entradas despues.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="336" /> - <source>Show differences</source> - <translation>Mostrar diferencias</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="338" /> - <source>Show &difference</source> - <translation>Mostrar &diferencia</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="345" /> + <source>Show differences</source> + <translation>Mostrar diferencias</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347" /> + <source>Show &difference</source> + <translation>Mostrar &diferencia</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="354" /> <source>Show the difference of the local project to the repository</source> <translation>Muestra las diferencias entre el proyecto local y el repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="357" /> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation><b>Mostrar diferencias</b><p>Muestra diferencias entre el proyecto local y el repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="360" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="358" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="369" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="367" /> <source>Show differences (extended)</source> <translation>Mostrar diferencias (extendido)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="367" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376" /> <source>Show the difference of revisions of the project to the repository</source> <translation>Muestra la diferencia de revisiones entre el proyecto local y el repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="370" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379" /> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation><b>Mostrar diferencias (extendido)</b><p>Muestra diferencias entre revisiones seleccionables del proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="380" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389" /> <source>Show status</source> <translation>Mostrar estado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="391" /> <source>Show &status...</source> <translation>Mostrar e&stado...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="397" /> <source>Show the status of the local project</source> <translation>Mostrar el estado del proyecto local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390" /> - <source><b>Show status</b><p>This shows the status of the local project.</p></source> - <translation><b>Mostrar estado</b><p>Muestra el estado del proyecto local.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="399" /> - <source>Show Summary</source> - <translation>Mostrar Sumario</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="401" /> - <source>Show summary...</source> - <translation>Mostrar Sumario...</translation> + <source><b>Show status</b><p>This shows the status of the local project.</p></source> + <translation><b>Mostrar estado</b><p>Muestra el estado del proyecto local.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408" /> + <source>Show Summary</source> + <translation>Mostrar Sumario</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="410" /> + <source>Show summary...</source> + <translation>Mostrar Sumario...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="417" /> <source>Show summary information of the working directory status</source> <translation>Mostrar información sumarial del estado del directorio de trabajo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="411" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420" /> <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> <translation><b>Mostrar sumario</b><p>Muestra información sumarial del estado del directorio de trabajo.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="430" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="430" /> <source>Show heads</source> <translation>Mostrar heads</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="432" /> <source>Show the heads of the repository</source> <translation>Mostrar los heads del repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="425" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="434" /> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation><b>Mostrar heads</b><p>Muestra los heads del repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="434" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="443" /> <source>Show parents</source> <translation>Mostrar parents</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="441" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450" /> <source>Show the parents of the repository</source> <translation>Mostrar los parents del repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="443" /> - <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> - <translation><b>Mostrar parents</b><p>Muestra los parents del repositorio.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="452" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="452" /> + <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> + <translation><b>Mostrar parents</b><p>Muestra los parents del repositorio.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461" /> <source>Show tip</source> <translation>Mostrar tip</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="463" /> <source>Show the tip of the repository</source> <translation>Mostrar el tip del repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="456" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="465" /> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation><b>Mostrar tip</b><p>Muestra el tip del repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462" /> - <source>Revert changes</source> - <translation>Revertir cambios</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464" /> - <source>Re&vert changes</source> - <translation>Re&vertir cambios</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471" /> + <source>Revert changes</source> + <translation>Revertir cambios</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="473" /> + <source>Re&vert changes</source> + <translation>Re&vertir cambios</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="480" /> <source>Revert all changes made to the local project</source> <translation>Revertir todos los cambios hechos al proyecto local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483" /> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation><b>Revertir cambios</b><p>Revierte todos los cambios hechos al proyecto local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2110" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2129" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492" /> <source>Merge</source> <translation>Hacer merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="485" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494" /> <source>Mer&ge changes...</source> <translation>Hacer mer&ge de los cambios...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501" /> <source>Merge changes of a revision into the local project</source> <translation>Hacer merge de los cambios de una revision en el proyecto local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="495" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="504" /> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation><b>Merge</b><p>Hace un merge de los cambios de una revision en el proyecto local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="506" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="515" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514" /> <source>Commit Merge</source> <translation>Commit Merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521" /> <source>Commit all the merged changes.</source> <translation>Hacer commit de los cambios con merge.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="523" /> <source><b>Commit a merge</b><p>This commits a merge working directory</p></source> <translation><b>Hacer commit de un merge</b><p>Ejecuta un commit de un directorio de trabajo en merge</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="523" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="533" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="532" /> <source>Abort Merge</source> <translation>Abortar Merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="531" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540" /> <source>Abort an uncommitted merge and lose all changes</source> <translation>Abortar un merge sin commit y perder todos los cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="543" /> <source><b>Abort uncommitted merge</b><p>This aborts an uncommitted merge causing all changes to be lost.</p></source> <translation><b>Abortar merge sin commit</b><p>Aborta un merge sin commit causando que se pierdan todos los cambios.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="546" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="544" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="553" /> <source>Re-Merge</source> <translation>Re-Merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="553" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="562" /> <source>Re-Merge all conflicting, unresolved files of the project</source> <translation>Aplicar Re-Merge a todos los archivos con conflictos sin resolver en el proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="556" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="565" /> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation><b>Re-Merge</b><p>Aplica un re-merge a todos los archivos con conflictos sin resolver del proyecto, descartando cualquier intento anterior de merge.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="575" /> <source>Show conflicts</source> <translation>Mostrar conflictos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="576" /> <source>Show conflicts...</source> <translation>Mostrar conflictos...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="583" /> <source>Show a dialog listing all files with conflicts</source> <translation>Mostrar un diálogo listando todos los archivos con conflictos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586" /> <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> <translation><b>Lista de Conflictos</b>\n<p>Muestra un listado de archivos que han tenido o tienen todavía conflictos.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596" /> <source>Conflicts resolved</source> <translation>Conflictos resueltos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="597" /> <source>Con&flicts resolved</source> <translation>Con&flictos resueltos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604" /> <source>Mark all conflicts of the local project as resolved</source> <translation>Marcar todos los conflictos del proyecto local como resueltos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="607" /> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation><b>Conflictos resueltos</b><p>Marca todos los conflictos del proyecto local como resueltos.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617" /> <source>Conflicts unresolved</source> <translation>Conflictos sin resolver</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625" /> <source>Mark all conflicts of the local project as unresolved</source> <translation>Marcar todos los conflictos del proyecto local como sin resolver</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628" /> <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> <translation><b>Conflictos sin resolver</b><p>Marca todos los conflictos del proyecto local como sin resolver.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638" /> <source>Tag in repository</source> <translation>Crear un Tag en el repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640" /> <source>&Tag in repository...</source> <translation>Crear un &Tag en el repositorio...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="637" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646" /> <source>Tag the local project in the repository</source> <translation>Crea un tag del proyecto local en el repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="639" /> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation><b>Crear un Tag en el repositorio</b><p>Crea un tag del proyecto local en el repositorio.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648" /> - <source>List tags</source> - <translation>Listar tags</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="649" /> - <source>List tags...</source> - <translation>Listar tags...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655" /> - <source>List tags of the project</source> - <translation>Lista los tags del proyecto</translation> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation><b>Crear un Tag en el repositorio</b><p>Crea un tag del proyecto local en el repositorio.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657" /> - <source><b>List tags</b><p>This lists the tags of the project.</p></source> - <translation><b>Listar tags</b><p>Lista los tags del proyecto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663" /> - <source>List branches</source> - <translation>Listar branches</translation> + <source>List tags</source> + <translation>Listar tags</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="658" /> + <source>List tags...</source> + <translation>Listar tags...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="664" /> - <source>List branches...</source> - <translation>Listar branches...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670" /> - <source>List branches of the project</source> - <translation>Lista las branches del proyecto</translation> + <source>List tags of the project</source> + <translation>Lista los tags del proyecto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666" /> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <translation><b>Listar tags</b><p>Lista los tags del proyecto.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672" /> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation><b>Listar branches</b><p>Lista las branches del proyecto.</p></translation> + <source>List branches</source> + <translation>Listar branches</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673" /> + <source>List branches...</source> + <translation>Listar branches...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="679" /> + <source>List branches of the project</source> + <translation>Lista las branches del proyecto</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681" /> - <source>Create branch</source> - <translation>Crear branch</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="683" /> - <source>Create &branch...</source> - <translation>Crear &branch...</translation> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation><b>Listar branches</b><p>Lista las branches del proyecto.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="690" /> + <source>Create branch</source> + <translation>Crear branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692" /> + <source>Create &branch...</source> + <translation>Crear &branch...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699" /> <source>Create a new branch for the local project in the repository</source> <translation>Crear una nueva branch para el proyecto local en el repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="693" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="702" /> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation><b>Crear branch</b><p>Crea una nueva branch para el proyecto local en el repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712" /> <source>Push new branch</source> <translation>Hacer push de nueva rama</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721" /> <source>Push the current branch of the local project as a new named branch</source> <translation>Ejecutar push de la rama actual del proyecto local como una nueva rama con nombre</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="717" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726" /> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation><b>Hacer push de nueva rama</b><p>Hace un push de la rama actual del proyecto local como una nueva rama con nombre.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="738" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736" /> <source>Close branch</source> <translation>Cerrar branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="745" /> <source>Close the current branch of the local project</source> <translation>Cerrar la branch actual para el proyecto local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748" /> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation><b>Cerrar branch</b><p>Cierra la branch actual del proyecto local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="758" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757" /> <source>Show current branch</source> <translation>Mostrar la branch actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="756" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765" /> <source>Show the current branch of the project</source> <translation>Mostrar la branch actual del proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="759" /> - <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> - <translation><b>Mostrar branch actual</b><p>Muestra la branch actual del proyecto.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768" /> - <source>Switch</source> - <translation>Hacer switch</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770" /> - <source>S&witch...</source> - <translation>Hacer s&witch...</translation> + <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> + <translation><b>Mostrar branch actual</b><p>Muestra la branch actual del proyecto.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777" /> + <source>Switch</source> + <translation>Hacer switch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="779" /> + <source>S&witch...</source> + <translation>Hacer s&witch...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786" /> <source>Switch the working directory to another revision</source> <translation>Hacer switch del directorio de trabajo a otra revisión</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="780" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="789" /> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation><b>Hacer switch</b><p>Hace un switch del directorio de trabajo a otra revisión.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799" /> <source>Cleanup</source> <translation>Limpiar (cleanup)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799" /> <source>Cleanu&p</source> <translation>Lim&piar (cleanup)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="792" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801" /> <source>Cleanup the local project</source> <translation>Limpiar (cleanup) el proyecto local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794" /> - <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> - <translation><b>Limpieza (cleanup)</b><p>Lleva a cabo un cleanup del proyecto local.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="803" /> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation><b>Limpieza (cleanup)</b><p>Lleva a cabo un cleanup del proyecto local.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="812" /> <source>Execute command</source> <translation>Ejecutar comando</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813" /> <source>E&xecute command...</source> <translation>E&jecutar comando...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="811" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="820" /> <source>Execute an arbitrary Mercurial command</source> <translation>Ejecuta un comando Mercurial arbitrario</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="814" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="823" /> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation><b>Ejecutar comando</b><p>Abre un diálogo para introducir un comando Mercurial arbitrario.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="824" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833" /> <source>Configure</source> <translation>Configurar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="834" /> <source>Configure...</source> <translation>Configurar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="841" /> <source>Show the configuration dialog with the Mercurial page selected</source> <translation>Mostrar el diálogo de configuración con la página de Mercurial seleccionada</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="835" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="844" /> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation><b>Configurar</b><p>Mostrar el diálogo de configuración con la página de Mercurial seleccionada.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854" /> <source>Edit user configuration</source> <translation>Editar configuración de usuario</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855" /> <source>Edit user configuration...</source> <translation>Editar configuración de usuario...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="862" /> <source>Show an editor to edit the user configuration file</source> <translation>Mostrar un editor para editar el archivo de configuración de usuario</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="856" /> - <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> - <translation><b>Editar configuración de usuario</b><p>Mostrar un editor para editar el archivo de configuración de usuario.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865" /> + <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> + <translation><b>Editar configuración de usuario</b><p>Mostrar un editor para editar el archivo de configuración de usuario.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874" /> <source>Edit repository configuration</source> <translation>Editar configuración del repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875" /> <source>Edit repository configuration...</source> <translation>Editar configuración del repositorio...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="873" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882" /> <source>Show an editor to edit the repository configuration file</source> <translation>Mostrar un editor para editar el archivo de configuración del repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="876" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885" /> <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation><b>Editar configuración del repositorio</b><p>Mostrar un editor para editar el archivo de configuración del repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895" /> <source>Show combined configuration settings</source> <translation>Mostrar ajustes de configuración combinados</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896" /> <source>Show combined configuration settings...</source> <translation>Mostrar ajustes de configuración combinados...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="894" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903" /> <source>Show the combined configuration settings from all configuration files</source> <translation>Mostrar los ajustes de configuración combinados de todos los archivos de configuración</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909" /> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation><b>Mostrar ajustes de configuración combinados</b><p>Muestra los ajustes de configuración combinados de todos los archivos de configuración.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919" /> <source>Show paths</source> <translation>Mostrar rutas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="911" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="920" /> <source>Show paths...</source> <translation>Mostrar rutas...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="918" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="927" /> <source>Show the aliases for remote repositories</source> <translation>Mostrar los alias para los repositorios remotos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="921" /> - <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> - <translation><b>Mostrar rutas</b><p>Muestra los alias para los repositorios remotos.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930" /> - <source>Verify repository</source> - <translation>Verificar repositorio</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="931" /> - <source>Verify repository...</source> - <translation>Verificar repositorio...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937" /> - <source>Verify the integrity of the repository</source> - <translation>Verificar la integridad del repositorio</translation> + <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> + <translation><b>Mostrar rutas</b><p>Muestra los alias para los repositorios remotos.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="939" /> - <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> - <translation><b>Verificar repositorio</b><p>Verifica la integridad del repositorio.</p></translation> + <source>Verify repository</source> + <translation>Verificar repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="940" /> + <source>Verify repository...</source> + <translation>Verificar repositorio...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="946" /> + <source>Verify the integrity of the repository</source> + <translation>Verificar la integridad del repositorio</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="948" /> + <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> + <translation><b>Verificar repositorio</b><p>Verifica la integridad del repositorio.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="957" /> <source>Recover</source> <translation>Recuperar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="948" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="957" /> <source>Recover...</source> <translation>Recuperar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="951" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960" /> <source>Recover from an interrupted transaction</source> <translation>Recuperar de una transacción interrumpida</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="954" /> - <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> - <translation><b>Recuperar</b><p>Recupera de una transacción interrumpida.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="963" /> - <source>Identify</source> - <translation>Identificar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964" /> - <source>Identify...</source> - <translation>Identificar...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="970" /> - <source>Identify the project directory</source> - <translation>Identificar el directorio de proyecto</translation> + <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> + <translation><b>Recuperar</b><p>Recupera de una transacción interrumpida.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="972" /> + <source>Identify</source> + <translation>Identificar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973" /> + <source>Identify...</source> + <translation>Identificar...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979" /> + <source>Identify the project directory</source> + <translation>Identificar el directorio de proyecto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="981" /> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation><b>Identificar</b><p>Identifica el directorio de proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="981" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="990" /> <source>Create .hgignore</source> <translation>Crear .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="989" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="998" /> <source>Create a .hgignore file with default values</source> <translation>Crear un archivo .hgignore con valores por defecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="992" /> - <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> - <translation><b>Crear .hgignore</b><p>Crea un archivo .hgignore con valores por defecto.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001" /> - <source>Create changegroup</source> - <translation>Crear changegroup</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1003" /> - <source>Create changegroup...</source> - <translation>Crear changegroup...</translation> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> + <translation><b>Crear .hgignore</b><p>Crea un archivo .hgignore con valores por defecto.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010" /> + <source>Create changegroup</source> + <translation>Crear changegroup</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1012" /> + <source>Create changegroup...</source> + <translation>Crear changegroup...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1019" /> <source>Create changegroup file collecting changesets</source> <translation>Crea un archivo de changegroup recogiendo changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1013" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1022" /> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation><b>Crear changegroup</b><p>Crea un archivo de changegroup recogiendo los changeset seleccionados (hg bundle).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1023" /> - <source>Preview changegroup</source> - <translation>Previsualizar changegroup</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1025" /> - <source>Preview changegroup...</source> - <translation>Previsualizar changegroup...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032" /> + <source>Preview changegroup</source> + <translation>Previsualizar changegroup</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1034" /> + <source>Preview changegroup...</source> + <translation>Previsualizar changegroup...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041" /> <source>Preview a changegroup file containing a collection of changesets</source> <translation>Previsualizar un archivo de changegroup conteniendo una colección de changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044" /> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation><b>Previsualizar changegroup</b><p>Previsualiza un archivo de changegroup conteniendo una colección de changesets.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2244" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1045" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2263" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054" /> <source>Apply changegroups</source> <translation>Aplicar changegroups</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1047" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056" /> <source>Apply changegroups...</source> <translation>Aplicar changegroups...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063" /> <source>Apply one or several changegroup files</source> <translation>Aplicar uno o varios archivos de changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066" /> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation><b>Aplicar changegroups</b><p>Aplica uno o varios archivos de changegroup generados por la acción 'Crear changegroup' (hg unbundle).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1067" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076" /> <source>Mark as "good"</source> <translation>Marcar como "bueno"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1077" /> <source>Mark as "good"...</source> <translation>Marcar como "bueno"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1075" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1084" /> <source>Mark a selectable changeset as good</source> <translation>Marcar un changeset seleccionable como bueno</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1078" /> - <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> - <translation><b>Marcar como bueno</b><p>Marca un changeset seleccionable como bueno.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1087" /> - <source>Mark as "bad"</source> - <translation>Marcar como "malo"</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088" /> - <source>Mark as "bad"...</source> - <translation>Marcar como "malo"...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1094" /> - <source>Mark a selectable changeset as bad</source> - <translation>Marcar un changeset seleccionable como malo</translation> + <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> + <translation><b>Marcar como bueno</b><p>Marca un changeset seleccionable como bueno.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1096" /> - <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> - <translation><b>Marcar como malo</b><p>Marca un changeset seleccionable como malo.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105" /> - <source>Skip</source> - <translation>Saltar</translation> + <source>Mark as "bad"</source> + <translation>Marcar como "malo"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1097" /> + <source>Mark as "bad"...</source> + <translation>Marcar como "malo"...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103" /> + <source>Mark a selectable changeset as bad</source> + <translation>Marcar un changeset seleccionable como malo</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105" /> + <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> + <translation><b>Marcar como malo</b><p>Marca un changeset seleccionable como malo.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1114" /> + <source>Skip</source> + <translation>Saltar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1114" /> <source>Skip...</source> <translation>Ignorar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1107" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116" /> <source>Skip a selectable changeset</source> <translation>Ignorar un changeset seleccionable</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1109" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118" /> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation><b>Ignorar</b><p>Ignora un changeset seleccionable.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1115" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1115" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124" /> <source>Reset</source> <translation>Reiniciar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1117" /> - <source>Reset the bisect search data</source> - <translation>Reiniciar los datos de búsqueda de bisect</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119" /> - <source><b>Reset</b><p>This resets the bisect search data.</p></source> - <translation><b>Reiniciar</b><p>Reinicia los datos de búsqueda de bisect.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1126" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1125" /> + <source>Reset the bisect search data</source> + <translation>Reiniciar los datos de búsqueda de bisect</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128" /> + <source><b>Reset</b><p>This resets the bisect search data.</p></source> + <translation><b>Reiniciar</b><p>Reinicia los datos de búsqueda de bisect.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1135" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134" /> <source>Back out changeset</source> <translation>Hacer respaldo de changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1142" /> <source>Back out changes of an earlier changeset</source> <translation>Hacer respaldo de cambios de un changeset anterior</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1145" /> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation><b>Hacer respaldo de changeset</b><p>Hace un respaldo de cambios de un changeset anterior.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1145" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1155" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154" /> <source>Rollback last transaction</source> <translation>Rollback de última transacción</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1152" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161" /> <source>Rollback the last transaction</source> <translation>Rollback de la última transacción</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1163" /> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation><b>Rollback de última transacción</b><p>Lleva a cabo un rollback de la última transacción. Las transactiones se utilizan para encapsular los efectos de todos los comandos que crean nuevos changesets or propagan changesets existentes hacia un repository. Por ejemplo, los siguientes comandos son transaccionales, y sus efectos pueden ser revertidos (rollback):<ul><li>commit</li><li>import</li><li>pull</li><li>push (con este repositorio como destino)</li><li>unbundle</li></ul></p><p><strong>Este comando es peligroso. Utiliícelo por favor con cuidado.</strong></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1176" /> - <source>Serve project repository</source> - <translation>Servir repositorio de proyecto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1177" /> - <source>Serve project repository...</source> - <translation>Servir repositorio de proyecto...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183" /> - <source>Serve the project repository</source> - <translation>Servir el repositorio de proyecto</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185" /> + <source>Serve project repository</source> + <translation>Servir repositorio de proyecto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1186" /> + <source>Serve project repository...</source> + <translation>Servir repositorio de proyecto...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1192" /> + <source>Serve the project repository</source> + <translation>Servir el repositorio de proyecto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1194" /> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation><b>Servir repositorio de proyecto</b><p>Esto sirve el repositorio de proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2301" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1194" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1203" /> <source>Import Patch</source> <translation>Importar Patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1196" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1205" /> <source>Import Patch...</source> <translation>Importar Patch...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1202" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211" /> <source>Import a patch from a patch file</source> <translation>Importar un patch desde un archivo de patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1204" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1213" /> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation><b>Importar Patch</b><p>Importa un patch desde un archivo de patch al proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1214" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1223" /> <source>Export Patches</source> <translation>Exportar Patches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1225" /> <source>Export Patches...</source> <translation>Exportar Patches...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1222" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1231" /> <source>Export revisions to patch files</source> <translation>Exportar revisiones a archivos de patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1224" /> - <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> - <translation><b>Exportar Patches</b><p>Exporta revisiones del proyecto a archivos de patch.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233" /> - <source>Change Phase</source> - <translation>Cambiar Fase</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234" /> - <source>Change Phase...</source> - <translation>Cambiar Fase...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1240" /> - <source>Change the phase of revisions</source> - <translation>Cambiar la fase de revisiones</translation> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> + <translation><b>Exportar Patches</b><p>Exporta revisiones del proyecto a archivos de patch.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1242" /> + <source>Change Phase</source> + <translation>Cambiar Fase</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1243" /> + <source>Change Phase...</source> + <translation>Cambiar Fase...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1249" /> + <source>Change the phase of revisions</source> + <translation>Cambiar la fase de revisiones</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251" /> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation><b>Cambiar Fase</b><p>Cambia la fase de revisiones.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2343" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1804" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1253" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2362" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1822" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1262" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1260" /> <source>Copy Changesets</source> <translation>Copiar Changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1259" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1268" /> <source>Copies changesets from another branch</source> <translation>Copiar changesets de otra branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1261" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270" /> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation><b>Copiar Changesets</b><p>Copia changesets de otra branch encima del directorio de trabajo actual con el usuario, fecha y descripción del changeset original.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1273" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1272" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1282" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1281" /> <source>Continue Copying Session</source> <translation>Continuar Sesión de Copia</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1280" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1289" /> <source>Continue the last copying session after conflicts were resolved</source> <translation>Continuar la última sesión de copia despues de resolver los conflictos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1283" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1292" /> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation><b>Continuar Sesión de Copia</b><p>Continua la última sesión de copia despues de resolver los conflictos.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1294" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1293" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1303" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1302" /> <source>Stop Copying Session</source> <translation>Detener la Sesión de Copia</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1310" /> <source>Stop the interrupted copying session</source> <translation>Detener la sesión de copia interrumpida</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1304" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1313" /> <source><b>Stop Copying Session</b><p>This stops the interrupted copying session.</p></source> <translation><b>Detener Sesión de Copia</b><p>Detiene la sesión de copia interrumpida.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1314" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1313" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1323" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1322" /> <source>Abort Copying Session</source> <translation>Abortar Sesión de Copia</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1321" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330" /> <source>Abort the interrupted copying session and rollback</source> <translation>Abortar la sesión interrumpida de copia y hacer rollback</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1324" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1333" /> <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> <translation><b>Abortar Sesión de Copia</b><p>Aborta la sesión de copia interrumpida y hace un rollback al estado anterior de la copia.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1334" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1343" /> <source>Add</source> <translation>Añadir</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1336" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1345" /> <source>Add...</source> <translation>Añadir...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1342" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1351" /> <source>Add a sub-repository</source> <translation>Añadir un sub-repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1344" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1353" /> <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation><b>Añadir...</b><p>Añadir un sub-repositorio al proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1350" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1359" /> <source>Remove</source> <translation>Eliminar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1352" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1361" /> <source>Remove...</source> <translation>Eliminar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1358" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367" /> <source>Remove sub-repositories</source> <translation>Eliminar sub-repositorios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1360" /> - <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> - <translation><b>Eliminar...</b><p>Eliminar sub-repositorios del proyecto.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1369" /> - <source>Create unversioned archive</source> - <translation>Crear archivo sin versionar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1371" /> - <source>Create unversioned archive...</source> - <translation>Crear archivo sin versionar...</translation> + <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> + <translation><b>Eliminar...</b><p>Eliminar sub-repositorios del proyecto.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1378" /> + <source>Create unversioned archive</source> + <translation>Crear archivo sin versionar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1380" /> + <source>Create unversioned archive...</source> + <translation>Crear archivo sin versionar...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1387" /> <source>Create an unversioned archive from the repository</source> <translation>Crear un archivo sin versionar a partir del repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1381" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1390" /> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation><b>Crear archivo sin versionar...</b><p>Crea un archivo sin versionar a partir del repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1391" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1400" /> <source>List bookmarks</source> <translation>Listar marcadores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1393" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1402" /> <source>List bookmarks...</source> <translation>Listar marcadores...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1399" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1408" /> <source>List bookmarks of the project</source> <translation>Lista marcadores del proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1401" /> - <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> - <translation><b>Listar marcadores</b><p>Lista los marcadores del proyecto.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1410" /> - <source>Define bookmark</source> - <translation>Definir marcador</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1412" /> - <source>Define bookmark...</source> - <translation>Definir marcador...</translation> + <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> + <translation><b>Listar marcadores</b><p>Lista los marcadores del proyecto.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1419" /> + <source>Define bookmark</source> + <translation>Definir marcador</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1421" /> + <source>Define bookmark...</source> + <translation>Definir marcador...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1428" /> <source>Define a bookmark for the project</source> <translation>Define un marcador para el proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1422" /> - <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> - <translation><b>Definir marcador</b><p>Define un marcador para el proyecto.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1431" /> - <source>Delete bookmark</source> - <translation>Borrar marcador</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1433" /> - <source>Delete bookmark...</source> - <translation>Borrar marcador...</translation> + <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> + <translation><b>Definir marcador</b><p>Define un marcador para el proyecto.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1440" /> + <source>Delete bookmark</source> + <translation>Borrar marcador</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1442" /> + <source>Delete bookmark...</source> + <translation>Borrar marcador...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1449" /> <source>Delete a bookmark of the project</source> <translation>Borrar un marcador del proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1443" /> - <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> - <translation><b>Borrar marcador</b><p>Borra un marcador del proyecto.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1452" /> - <source>Rename bookmark</source> - <translation>Renombrar marcador</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1454" /> - <source>Rename bookmark...</source> - <translation>Renombrar marcador...</translation> + <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> + <translation><b>Borrar marcador</b><p>Borra un marcador del proyecto.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1461" /> + <source>Rename bookmark</source> + <translation>Renombrar marcador</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1463" /> + <source>Rename bookmark...</source> + <translation>Renombrar marcador...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1470" /> <source>Rename a bookmark of the project</source> <translation>Renombrar un marcador del proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1464" /> - <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> - <translation><b>Renombrar marcador</b><p>Renombra un marcador del proyecto.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1473" /> + <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> + <translation><b>Renombrar marcador</b><p>Renombra un marcador del proyecto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1482" /> <source>Move bookmark</source> <translation>Mover marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1475" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1484" /> <source>Move bookmark...</source> <translation>Mover marcador...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1481" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1490" /> <source>Move a bookmark of the project</source> <translation>Mover un marcador del proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1483" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1492" /> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation><b>Mover marcador</b><p>Mueve un marcador del proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1495" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1493" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1504" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1502" /> <source>Show incoming bookmarks</source> <translation>Mostrar marcadores entrantes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1502" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1511" /> <source>Show a list of incoming bookmarks</source> <translation>Muestra una lista de marcadores entrantes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1505" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1514" /> <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> <translation><b>Mostrar marcadores entrantes</b><p>Muestra una lista de nuevos marcadores disponibles en el repositorio remoto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1517" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1515" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1526" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1524" /> <source>Pull bookmark</source> <translation>Pull de marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1524" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1533" /> <source>Pull a bookmark from a remote repository</source> <translation>Hacer pull de marcador desde un repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1527" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1536" /> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation><b>Hacer pull de marcador</b><p>Hace pull de un marcador desde un repositorio remoto al repositorio local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1539" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1537" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1548" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1546" /> <source>Pull current bookmark</source> <translation>Pull del marcador actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1546" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1555" /> <source>Pull the current bookmark from a remote repository</source> <translation>Hacer pull del marcador actual desde repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1549" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1558" /> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation><b>Pull de marcador actual<p>Ejecuta un pull del marcador actual desde un repositorio remoto al repositorio local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1560" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1558" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1569" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1567" /> <source>Show outgoing bookmarks</source> <translation>Mostrar marcadores salientes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1567" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1576" /> <source>Show a list of outgoing bookmarks</source> <translation>Muestra una lista de marcadores salientes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1570" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1579" /> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation><b>Mostrar marcadores salientes</b><p>Muestra una lista de nuevos marcadores disponibles en el repositorio local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1582" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1580" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1591" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1589" /> <source>Push bookmark</source> <translation>Push de marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1589" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1598" /> <source>Push a bookmark to a remote repository</source> <translation>Hacer push de marcador a un repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1592" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1601" /> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation><b>Hacer push de marcador</b><p>Hace push de un marcador desde un repositorio local al repositorio remoto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1604" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1602" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1613" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1611" /> <source>Push current bookmark</source> <translation>Push de marcador actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1611" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1620" /> <source>Push the current bookmark to a remote repository</source> <translation>Hacer push del marcador actual hacia repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1614" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1623" /> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation><b>Push de marcador actual<p>Ejecuta un pshl del marcador actual desde 3l repositorio local hacia un repositorio remoto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1626" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1624" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1635" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1633" /> <source>Push all bookmarks</source> <translation>Hacer Push de todos los marcadores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1633" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1642" /> <source>Push all bookmarks to a remote repository</source> <translation>Hacer push de todos los marcadores a repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1636" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1645" /> <source><b>Push all bookmarks</b><p>This pushes all bookmark from the local repository to a remote repository.</p></source> <translation><b>Push de todos los marcadores</b><p>Hace un push the todos los marcadores desde el repositorio local a un repositorio remoto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1647" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1645" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1656" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1654" /> <source>Delete all backups</source> <translation>Borrar todas las Copias de Seguridad</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1654" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1663" /> <source>Delete all backup bundles stored in the backup area</source> <translation>Borrar todos los bundles de copia de seguridad almacenados en el área de copias de seguridad</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1657" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1666" /> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation><b>Borrar todas las copias de seguridad</b><p>Borra todos los bundles de copia de seguridad almacenados en el área de copias de seguridad del repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1699" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1708" /> <source>Administration</source> <translation>Administración</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1724" /> - <source>Specials</source> - <translation>Especial</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1733" /> + <source>Specials</source> + <translation>Especial</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1742" /> <source>Changegroup Management</source> <translation>Gestión de Chagegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1740" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1749" /> <source>Patch Management</source> <translation>Gestión de Patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1746" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1755" /> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1754" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1763" /> <source>Tags</source> <translation>Tags</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1761" /> - <source>Branches</source> - <translation>Branches</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1770" /> + <source>Branches</source> + <translation>Branches</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1779" /> <source>Bookmarks</source> <translation>Marcadores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1791" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1800" /> + <source>Other Functions</source> + <translation>Otras Funciones</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1809" /> <source>Extensions</source> <translation>Extensiones</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1813" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1831" /> <source>Sub-Repository</source> <translation>Sub-repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1818" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1836" /> <source>Merge Changesets</source> <translation>Hacer Merge de Changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1903" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1901" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1922" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1920" /> <source>Mercurial</source> <translation>Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2054" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2073" /> <source>Pull</source> <translation>Hacer Pull</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2391" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2375" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2360" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2344" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2323" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2302" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2245" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2055" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2410" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2394" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2379" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2363" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2342" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2321" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2264" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2074" /> <source>The project should be reread. Do this now?</source> <translation>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2322" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2341" /> <source>Revert Changes</source> <translation>Revertir cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2359" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2378" /> <source>Copy Changesets (Continue)</source> <translation>Copiar Changesets (Continuar)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2374" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2393" /> <source>Copy Changesets (Stop)</source> <translation>Copiar Changesets (Stop)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2390" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2409" /> <source>Copy Changesets (Abort)</source> <translation>Copiar Changesets (Abortar)</translation> </message> @@ -40736,7 +40936,7 @@ <context> <name>HgPurgeListDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/HgPurgeListDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/HgPurgeListDialog.ui" line="0" /> <source>Purge List</source> <translation>Lista de Purge</translation> </message> @@ -41908,87 +42108,87 @@ <context> <name>HgShelveBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Mercurial Shelve Browser</source> <translation>Navegador de Mercurial Shelve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Name</source> <translation>Nombre</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Age</source> <translation>Edad</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Message</source> <translation>Mensaje</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Statistics</source> <translation>Estadísticas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>File</source> <translation>Archivo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Changes</source> <translation>Cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Lines added</source> <translation>Líneas añadidas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Lines deleted</source> <translation>Líneas borradas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Errors</source> <translation>Errores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source><b>Mercurial shelve errors</b><p>This shows possible error messages of the hg shelve command.</p></source> <translation><b>Errores de Mercurial shelve</b><p>Muestra los posibles mensajes de error del comando hg shelve.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="58" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="58" /> <source>&Refresh</source> <translation>Actualiza&r</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="60" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="60" /> <source>Press to refresh the list of shelves</source> <translation>Pulsar para actualizar la lista de shelves</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="69" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="69" /> <source>Restore selected shelve</source> <translation>Restaurar shelve seleccionado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="72" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="72" /> <source>Delete selected shelves</source> <translation>Borrar shelves seleccionados</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="75" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="75" /> <source>Delete all shelves</source> <translation>Borrar todos los shelves</translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="290" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="290" /> <source>%n file(s) changed</source> <translation> <numerusform>%n archivo cambiado</numerusform> @@ -41996,7 +42196,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="292" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="292" /> <source>%n line(s) inserted</source> <translation> <numerusform>%n línea insertada</numerusform> @@ -42004,7 +42204,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="295" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="295" /> <source>%n line(s) deleted</source> <translation> <numerusform>%n línea borrada</numerusform> @@ -42015,57 +42215,57 @@ <context> <name>HgShelveDataDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Shelve</source> <translation>Shelve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Name:</source> <translation>Nombre:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Enter a name for the shelve</source> <translation>Introducir un nombre para el shelve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Date, Time:</source> <translation>Fecha, Hora:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Enter the commit date and time for the shelve</source> <translation>Introducir la fecha y hora del commit para el shelve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>yyyy-MM-dd HH:mm</source> <translation>yyyy-MM-dd HH:mm</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Message:</source> <translation>Mensaje:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Enter a message for the shelve</source> <translation>Introducir un mensaje para el shelve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Mark new/missing files as added/removed</source> <translation>Marcar archivos nuevos/perdidos como añadidos/eliminados</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Select to shelve, but keep the changes in the working directory</source> <translation>Seleccionar para hacer shelve, pero conservar los cambios en el directorio de trabajo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Shelve, but keep changes</source> <translation>Shelve, pero conservar cambios</translation> </message> @@ -42073,7 +42273,7 @@ <context> <name>HgShelvesSelectionDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelvesSelectionDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelvesSelectionDialog.ui" line="0" /> <source>Mercurial Shelve Selection</source> <translation>Selección de Mercurial Shelve</translation> </message> @@ -42169,7 +42369,7 @@ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="104" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="93" /> <source>not tracked</source> - <translation>sin seguimiento</translation> + <translation>no rastreados</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="105" /> @@ -42375,129 +42575,6 @@ </message> </context> <context> - <name>HgStripDialog</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Strip Changesets</source> - <translation>Desmontar Changesets</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>&Revision</source> - <translation>&Revisión</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to specify a revision by number</source> - <translation>Seleccionar para especificar una revisión por número</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Number</source> - <translation>Número</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enter a revision number</source> - <translation>Introducir un número de revisión</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to specify a revision by changeset id</source> - <translation>Seleccionar para especificar una revisión por changeset id</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Id:</source> - <translation>Id:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enter a changeset id</source> - <translation>Introducir un id de changeset</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to specify a revision by a tag</source> - <translation>Seleccionar para especificar una revisión por tag</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Tag:</source> - <translation>Tag:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enter a tag name</source> - <translation>Introducir nombre de tag</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to specify a revision by a branch</source> - <translation>Seleccionar para especificar una revisión por branch</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Branch:</source> - <translation>Branch:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enter a branch name</source> - <translation>Introducir un nombre de branch</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Expression:</source> - <translation>Expresión:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enter a revision set expression</source> - <translation>Introducir una expresión de revision set</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Bookmark:</source> - <translation>Marcador:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enter a bookmark name</source> - <translation>Introduzca un nombre de marcador</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to enforce removal of changesets</source> - <translation>Seleccionar para forzar eliminación de changesets</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enforce Operation</source> - <translation>Forzar Operación</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to not create backup bundles</source> - <translation>Seleccionar para no crear bundles de copia de seguridad</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>No Backup</source> - <translation>Sin Copia de Seguridad</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to keep the current working directory state</source> - <translation>Seleccionar para conservar el estado del directorio de trabajo actual</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Keep Working Directory</source> - <translation>Conservar Directorio de Trabajo</translation> - </message> - </context> - <context> <name>HgSummaryDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.ui" line="0" /> @@ -43003,29 +43080,119 @@ </message> </context> <context> + <name>HgUncommitDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Undo Local Commit</source> + <translation>Deshacer Commit Local</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Commit Message</source> + <translation>Mensaje de Commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Enter the log message.</source> + <translation>Introducir el mensaje de log.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source><b>Log Message</b> +<p>Enter the log message for the uncommit action.</p></source> + <translation><b>Mensaje de Log</b> +<p>Introducir el mensaje de log para la acción de uncommit.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Recent commit messages</source> + <translation>Mensajes recientes de commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Select a recent commit message to use</source> + <translation>Seleccione un mensaje de commit reciente para utilizar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Select to allow an empty commit after undoing it.</source> + <translation>Seleccionar para permitir un commit vacío después de deshacerlo.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Allow empty commit after undoing commit</source> + <translation>Permitir commit vacío después de deshacer commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Select to allow undoing the commit with outstanding changes.</source> + <translation>Seleccionar para permitir deshacer el commit con cambios notables.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Allow undoing commit with outstanding changes</source> + <translation>Permitir deshacer commits con cambios notables</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Author</source> + <translation>Autor</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Enter author name to override the configured user:</source> + <translation>Introducir el nombre del autor para sobreescribir el usuario configurado:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Enter an author name in order to override the configured one</source> + <translation>Introducir un nombre del autor para sobreescribir el establecido por configuración</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Select to give date and time information</source> + <translation>Seleccionar para dar información de fecha y hora</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Date and Time</source> + <translation>Fecha y Hora</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Date/Time:</source> + <translation>Fecha/Hora:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Enter the date and time to be used</source> + <translation>Introducir la fecha y hora a usar</translation> + </message> + </context> + <context> <name>HgUnshelveDataDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Mercurial Unshelve</source> <translation>Mercurial Unshelve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Name:</source> <translation>Nombre:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Enter the name of the shelve</source> <translation>Introducir el nombre del shelve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Select to keep the shelved change</source> <translation>Seleccionar para conservar el cambio del shelve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Keep shelved change</source> <translation>Conservar el cambio del shelve</translation> </message> @@ -43095,23 +43262,23 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the GPG extension</source> - <translation>Seleccionar para activar la extensión GPG</translation> + <source>Select to activate the rebase extension</source> + <translation>Seleccionar para activar la extensión 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>Seleccionar para activar la extensión histedit</translation> + <source>Select to activate the queues extension</source> + <translation>Seleccionar para activar la extensión 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" /> @@ -43126,53 +43293,43 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the Purge extension</source> - <translation>Seleccionar para activar la extensión purge</translation> + <source>Select to activate the histedit extension</source> + <translation>Seleccionar para activar la extensión histedit</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Purge</source> - <translation>Purge</translation> + <source>Histedit</source> + <translation>Histedit</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the queues extension</source> - <translation>Seleccionar para activar la extensión queues</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Queues</source> - <translation>Queues</translation> + <source>Select to activate the GPG extension</source> + <translation>Seleccionar para activar la extensión GPG</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the rebase extension</source> - <translation>Seleccionar para activar la extensión rebase</translation> + <source>GPG</source> + <translation>GPG</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Rebase</source> - <translation>Rebase</translation> + <source>Select to activate the fastexport extension</source> + <translation>Seleccionar para activar la extensión de fastexport</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the shelve extension</source> - <translation>Seleccionar para activar la extensión shelve</translation> + <source>Fastexport</source> + <translation>Fastexport</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Shelve</source> - <translation>Shelve</translation> + <source>Select to activate the uncommit extension</source> + <translation>Seleccionar para activar la extensión de uncommit</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the strip extension</source> - <translation>Seleccionar para activar la extensión strip</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Strip</source> - <translation>Strip</translation> + <source>Uncommit</source> + <translation>Uncommit</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> @@ -43391,32 +43548,32 @@ <translation>Por defecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="527" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="474" /> <source>Delete Host Fingerprint</source> <translation>Borrar Fingerprint del Host</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="528" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="475" /> <source><p>Shall the fingerprint for host <b>{0}</b> really be deleted?</p></source> <translation><p>¿Está seguro de eliminar el fingerprint para el host <b>{0}</b>?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="644" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="591" /> <source>Delete Host Minimum Protocol</source> <translation>Borrar Protocolo Mínimo para Host</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="645" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="592" /> <source><p>Shall the minimum protocol entry for host <b>{0}</b> really be deleted?</p></source> <translation><p>¿Se debe realmente eliminar la entrada de protocolo mínimo para el host <b>{0}</b> ?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="708" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="655" /> <source>Edit User Configuration</source> <translation>Editar Configuración de Usuario</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="709" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="656" /> <source>You will loose all changes made in this dialog. Shall the data be saved first?</source> <translation>Van a perderse todos los cambios hechos en este diálogo. ¿Desea guardar los estos datos?</translation> </message> @@ -43495,17 +43652,17 @@ <context> <name>HgUtilities</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="130" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="132" /> <source>The hg process finished with the exit code {0}</source> <translation>El proceso hg ha terminado con código de salida {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="134" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="136" /> <source>The hg process did not finish within 30s.</source> <translation>El proceso hg no terminó en un plazo de 30s.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="138" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="140" /> <source>Could not start the hg executable.</source> <translation>No se ha podido iniciar el ejecutable de hg.</translation> </message> @@ -52670,8 +52827,8 @@ <translation>Basada en 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>Dispositivo Desconocido</translation> </message> @@ -54036,7 +54193,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>{0} (0x{1:04x}/0x{2:04x})</translation> </message> <message> @@ -59596,40 +59753,40 @@ <translation>Desinstalar Packages desde 'pyproject.toml'</translation> </message> <message> - <location filename="../PipInterface/Pip.py" line="1195" /> + <location filename="../PipInterface/Pip.py" line="1197" /> <source>Cache Info</source> <translation>Info de Cache</translation> </message> <message> - <location filename="../PipInterface/Pip.py" line="1221" /> - <location filename="../PipInterface/Pip.py" line="1212" /> + <location filename="../PipInterface/Pip.py" line="1223" /> + <location filename="../PipInterface/Pip.py" line="1214" /> <source>List Cached Files</source> <translation>Listar Archivos en Cache</translation> </message> <message> - <location filename="../PipInterface/Pip.py" line="1213" /> + <location filename="../PipInterface/Pip.py" line="1215" /> <source>Enter a file pattern (empty for all):</source> <translation>Introducir un patrón de archivo (dejar en blanco para todos):</translation> </message> <message> - <location filename="../PipInterface/Pip.py" line="1245" /> - <location filename="../PipInterface/Pip.py" line="1238" /> + <location filename="../PipInterface/Pip.py" line="1247" /> + <location filename="../PipInterface/Pip.py" line="1240" /> <source>Remove Cached Files</source> <translation>Eliminar Archivos en Cache</translation> </message> <message> - <location filename="../PipInterface/Pip.py" line="1239" /> + <location filename="../PipInterface/Pip.py" line="1241" /> <source>Enter a file pattern:</source> <translation>Introducir un patrón de archivo:</translation> </message> <message> - <location filename="../PipInterface/Pip.py" line="1270" /> - <location filename="../PipInterface/Pip.py" line="1262" /> + <location filename="../PipInterface/Pip.py" line="1272" /> + <location filename="../PipInterface/Pip.py" line="1264" /> <source>Purge Cache</source> <translation>Purgar Cache</translation> </message> <message> - <location filename="../PipInterface/Pip.py" line="1263" /> + <location filename="../PipInterface/Pip.py" line="1265" /> <source>Do you really want to purge the pip cache? All files need to be downloaded again.</source> <translation>Desear realmente purgar la cache de pip? Todos los archivos necesitarán descargarse de nuevo.</translation> </message> @@ -60249,75 +60406,13 @@ </message> <message> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to install the selected package</source> - <translation>Pulsar para instalar el package seleccionado</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to install the selected package to the user site</source> - <translation>Seleccionar para instalar el package seleccionado en el site de usuario</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to show details for the selected entry</source> - <translation>Pulsar para mostrar detalles para la entrada seleccionada</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Toggle to show or hide the search window</source> - <translation>Conmutar para mostrar u ocultar la ventana de búsqueda</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Package</source> - <translation>Package</translation> + <source>Press to refresh the lists</source> + <translation>Pulsar para actualizar las listas</translation> </message> <message> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Enter the search term for the package name</source> - <translation>Introducir el término de búsqueda para el nombre de package</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Enter search term</source> - <translation>Introducir término de búsqueda</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to start the search</source> - <translation>Pulsar para iniciar la búsqueda</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to search for more packages</source> - <translation>Pulsar para buscar más packages</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Version</source> - <translation>Versión</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Released</source> - <translation>Liberado</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Description</source> - <translation>Descripción</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to refresh the lists</source> - <translation>Pulsar para actualizar las listas</translation> + <source>Press to install a package.</source> + <translation>Pulsar para instalar un package.</translation> </message> <message> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> @@ -60336,6 +60431,17 @@ </message> <message> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Press to show details for the selected entry</source> + <translation>Pulsar para mostrar detalles para la entrada seleccionada</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Press to remove leftovers of an upgrade or uninstall run.</source> + <translation>Pulsar para eliminar residuos de ejecución de una actualización o desinstalación.</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> <source>Select to show only locally-installed packages</source> <translation>Seleccionar para mostrar solo packages instalados localmente</translation> </message> @@ -60379,6 +60485,13 @@ <message> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Package</source> + <translation>Package</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> <source>Installed</source> <translation>Instalado</translation> </message> @@ -60473,316 +60586,315 @@ <translation>Requerido</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="199" /> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Search Package:</source> + <translation>Buscar Package:</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Enter package name to search for.</source> + <translation>Introducir el nombre de package a buscar.</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Press to open a web browser for searching.</source> + <translation>Pulsar para abrir un navegador web para buscar.</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="83" /> <source>pip Menu</source> <translation>Menu pip</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="233" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="113" /> <source>Author:</source> <translation>Autor:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="234" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="114" /> <source>Author Email:</source> <translation>Correo electrónico del Autor:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="235" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="115" /> <source>Classifiers:</source> <translation>Clasificadores:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="236" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="116" /> <source>Entry Points:</source> <translation>Puntos de Entrada:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="237" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="117" /> <source>Files:</source> <translation>Archivos:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="238" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="118" /> <source>Homepage:</source> <translation>Página Home:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="239" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="119" /> <source>Installer:</source> <translation>Instalador:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="240" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="120" /> <source>License:</source> <translation>Licencia:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="241" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="121" /> <source>Location:</source> <translation>Ubicación:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="242" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="122" /> <source>Metadata Version:</source> <translation>Versión de Metadatos:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="243" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="123" /> <source>Name:</source> <translation>Nombre:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="244" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="124" /> <source>Project URLs:</source> <translation>URLs de Proyecto:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="245" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="125" /> <source>Requires:</source> <translation>Requiere:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="246" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="126" /> <source>Required By:</source> <translation>Requerido Por:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="247" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="127" /> <source>Summary:</source> <translation>Resumen:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="248" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="128" /> <source>Version:</source> <translation>Versión:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="450" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="335" /> <source>Getting installed packages...</source> <translation>Obteniendo packages instalados...</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="478" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="363" /> <source>Getting outdated packages...</source> <translation>Obteniendo packages antiguos...</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1231" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1051" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1038" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1002" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="735" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="729" /> + <source>Cleanup Environment</source> + <translation>Limpieza de Entorno</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="730" /> + <source>The environment cleanup was successful.</source> + <translation>La limpieza de entorno ha tenido éxito.</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="736" /> + <source>Some leftover package directories could not been removed. Delete them manually.</source> + <translation>Algunos directorios residuales de package no se han podido eliminar. Borrarlos manualmente.</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="832" /> <source>Search PyPI</source> <translation>Buscar PyPI</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1003" /> - <source><p>Received an error while searching for <b>{0}</b>.</p><p>Error: {1}</p></source> - <translation><p>Recibido error mientras se buscaba <b>{0}</b>.</p><p>Error: {1}</p></translation> - </message> - <message numerus="yes"> - <location filename="../PipInterface/PipPackagesWidget.py" line="1018" /> - <source>%n package(s) found.</source> - <translation> - <numerusform>%n package encontrado.</numerusform> - <numerusform>%n packages encontrados.</numerusform> - </translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1025" /> - <source>Showing first {0} packages found.</source> - <translation>Mostrando primeros {0} packages encontrados.</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1044" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1039" /> - <source><p>There were no results for <b>{0}</b>.</p></source> - <translation><p>Sin resultados para <b>{0}</b>.</p></translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1052" /> - <source><p>There were no more results for <b>{0}</b>.</p></source> - <translation><p>No hay más resultados para <b>{0}</b>.</p></translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1232" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="833" /> <source><p>No package details info for <b>{0}</b> available.</p></source> <translation><p>No hay info de detalles de package disponible para <b>{0}</b>.</p></translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1251" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="852" /> <source>Pip</source> <translation>Pip</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1253" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="854" /> <source>Install Pip</source> <translation>Instalar Pip</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1256" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="857" /> <source>Install Pip to User-Site</source> <translation>Instalar Pip en el Sitio de Usuario</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1259" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="860" /> <source>Repair Pip</source> <translation>Reparar Pip</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1266" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="867" /> <source>Install</source> <translation>Instalar</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1445" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1268" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1046" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="869" /> <source>Install Packages</source> <translation>Instalar Packages</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1271" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="872" /> <source>Install Local Package</source> <translation>Instalar Package Local</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1274" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="875" /> <source>Re-Install Selected Packages</source> <translation>Reinstalar los Packages Seleccionados</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1281" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="882" /> <source>Requirements/Constraints</source> <translation>Requisitos/Restricciones</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1283" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="884" /> <source>Install Requirements</source> <translation>Instalar Requisitos</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1286" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="887" /> <source>Uninstall Requirements</source> <translation>Desinstalar Requisitos</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1289" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="890" /> <source>Generate Requirements...</source> <translation>Generar Requisitos...</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1293" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="894" /> <source>Install from 'pyproject.toml'</source> <translation>Instalar desde 'pyproject.toml'</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1297" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="898" /> <source>Uninstall from 'pyproject.toml'</source> <translation>Desinstalar desde 'pyproject.toml'</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1302" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="903" /> <source>Generate Constraints...</source> <translation>Generar Restricciones...</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1309" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="910" /> <source>Cache</source> <translation>Caché</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1311" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="912" /> <source>Show Cache Info...</source> <translation>Mostrar info de Cache...</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1314" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="915" /> <source>Show Cached Files...</source> <translation>Mostrar Archivos en Cache...</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1317" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="918" /> <source>Remove Cached Files...</source> <translation>Eliminar Archivos en Cache...</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1320" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="921" /> <source>Purge Cache...</source> <translation>Purgar Cache...</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1337" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="938" /> <source>Show Licenses...</source> <translation>Mostrar Licencias...</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1341" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="942" /> <source>Check Vulnerabilities</source> <translation>Comprobar Vulnerabilidades</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1345" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="946" /> <source>Update Vulnerability Database</source> <translation>Actualizar Base de Datos de Vulnerabilidades</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1349" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="950" /> <source>Create SBOM file</source> <translation>Crear archivo SBOM</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1356" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="957" /> <source>Edit User Configuration...</source> <translation>Editar Configuración de Usuario...</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1359" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="960" /> <source>Edit Environment Configuration...</source> <translation>Editar Configuración de Entorno...</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1364" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="965" /> <source>Configure...</source> <translation>Configurar...</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1608" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1595" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1584" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1209" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1196" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1185" /> <source>Edit Configuration</source> <translation>Editar Configuración</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1609" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1596" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1585" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1210" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1197" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1186" /> <source>No valid configuration path determined. Aborting</source> <translation>No hay una ruta válida de configuración determinada. Abortando</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1818" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1419" /> <source>{0} {1}</source> <comment>package name, package version</comment> <translation>{0} {1}</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1839" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1440" /> <source>Affected Version:</source> <translation>Versión Afectada:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1842" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1443" /> <source>Advisory:</source> <translation>Recomendatorio:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1977" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1952" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1578" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1553" /> <source>unknown</source> <translation>desconocido</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1974" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1575" /> <source>any</source> <translation>cualquiera</translation> </message> @@ -61621,64 +61733,69 @@ <name>PluginRepositoryWidget</name> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="124" /> - <source>Stable</source> - <translation>Estable</translation> + <source>Obsolete</source> + <translation>Obsoleto</translation> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="125" /> - <source>Unstable</source> - <translation>Inestable</translation> + <source>Stable</source> + <translation>Estable</translation> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="126" /> - <source>Obsolete</source> - <translation>Obsoleto</translation> + <source>Unknown</source> + <translation>Desconocido</translation> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="127" /> - <source>Unknown</source> - <translation>Desconocido</translation> - </message> - <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="179" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="139" /> - <source>Update</source> - <translation>Actualización</translation> + <source>Unstable</source> + <translation>Inestable</translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="128" /> + <source>Upgrade Available</source> + <translation>Actualización Disponible</translation> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="182" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="145" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="142" /> + <source>Update</source> + <translation>Actualización</translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="185" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="148" /> <source>Download</source> <translation>Descarga</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="153" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="156" /> <source>Download & Install</source> <translation>Descargar & Instalar</translation> </message> <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="191" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="164" /> + <source>Cancel</source> + <translation>Cancelar</translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="170" /> + <source>Install</source> + <translation>Instalar</translation> + </message> + <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="188" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="161" /> - <source>Cancel</source> - <translation>Cancelar</translation> - </message> - <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="167" /> - <source>Install</source> - <translation>Instalar</translation> - </message> - <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="185" /> <source>Download && Install</source> <translation>Descargar && Instalar</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="191" /> - <source>Close && Install</source> - <translation>Cerrar && Instalar</translation> - </message> - <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="194" /> + <source>Close && Install</source> + <translation>Cerrar && Instalar</translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="197" /> <source>Close</source> <translation>Cerrar</translation> </message> @@ -61730,98 +61847,103 @@ <translation>Los plugins solicitados han sido descargados.</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="603" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="591" /> <source>Plugins Repository URL Changed</source> <translation>La URL del Repositorio de Plugins Ha Cambiado</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="604" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="592" /> <source>The URL of the Plugins Repository has changed. Select the "Update" button to get the new repository file.</source> <translation>La URL del repositorio de plugins ha cambiado. Seleccionar el botón 'Actualizar' para obtener el nuevo archivo del repositorio.</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="613" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="601" /> <source>Read plugins repository file</source> <translation>Leer archivo de repositorio de plugins</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="614" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="602" /> <source><p>The plugins repository file <b>{0}</b> could not be read. Select Update</p></source> <translation><p>El archivo de repositorio de plugins <b>{0}</b> no se ha podido leer. Seleccione Actualizar</p></translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="623" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="611" /> <source>No plugin repository file available. Select Update.</source> <translation>No hay disponible ningún archivo de repositorio de plugins. Seleccione Actualizar.</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="627" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="615" /> <source>New: <b>{0}</b></source> <translation>Nuevo: <b>{0}</b></translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="629" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="617" /> <source>Local Updates: <b>{0}</b></source> <translation>Actualizaciones Locales: <b>{0}</b></translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="632" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="620" /> <source>Remote Updates: <b>{0}</b></source> <translation>Actualizaciones Remotas: <b>{0}</b></translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="705" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="673" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="693" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="661" /> <source>Error downloading file</source> <translation>Error al descargar el fichero</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="706" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="674" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="694" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="662" /> <source><p>Could not download the requested file from {0}.</p><p>Error: {1}</p></source> <translation><p>No se pudo descargar el archivo solicitado desde {0}.</p><p>Error: {1}</p></translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="677" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="665" /> <source>No connection to Internet.</source> <translation>Sin conexión a Internet.</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="849" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="810" /> <source>up-to-date</source> <translation>al dia</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="852" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="813" /> <source>new download available</source> <translation>mueva descarga disponible</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="856" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="818" /> <source>update installable</source> <translation>actualización instalable</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="860" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="823" /> <source>updated download available</source> <translation>descarga actualizada disponible</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="864" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="828" /> <source>error determining status</source> <translation>Error al determinar el estado</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1269" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1239" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1002" /> + <source>{0}. {1}</source> + <translation>{0}. {1}</translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1346" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1316" /> <source>Cleanup of Plugin Downloads</source> <translation>Limpieza de Descargas de Plugins</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1273" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1242" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1350" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1319" /> <source><p>The plugin download <b>{0}</b> could not be deleted.</p><p>Reason: {1}</p></source> <translation><p>La descarga del plugin <b>{0}</b> no se ha podido borrar.</p><p>Razón: {1}</p></translation> </message> @@ -61829,17 +61951,17 @@ <context> <name>PluginRepositoryWindow</name> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1126" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1203" /> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1127" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1204" /> <source><p>Could not start the process.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>No se ha podido ejecutar el proceso.<br>Asegúrese de que esta disponible como <b>{0}</b>.</p></translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1131" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1208" /> <source>OK</source> <translation>Aceptar</translation> </message> @@ -62216,18 +62338,18 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1907" /> + <location filename="../Preferences/__init__.py" line="1909" /> <source>Export Preferences</source> <translation>Exportar Preferencias</translation> </message> <message> + <location filename="../Preferences/__init__.py" line="1938" /> + <location filename="../Preferences/__init__.py" line="1911" /> + <source>Properties File (*.ini);;All Files (*)</source> + <translation>Archivo de Propiedades (*.ini);;Todos los archivos (*)</translation> + </message> + <message> <location filename="../Preferences/__init__.py" line="1936" /> - <location filename="../Preferences/__init__.py" line="1909" /> - <source>Properties File (*.ini);;All Files (*)</source> - <translation>Archivo de Propiedades (*.ini);;Todos los archivos (*)</translation> - </message> - <message> - <location filename="../Preferences/__init__.py" line="1934" /> <source>Import Preferences</source> <translation>Importar Preferencias</translation> </message> @@ -62786,79 +62908,79 @@ <translation>Gestor de conda</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="273" /> + <location filename="../Preferences/ProgramsDialog.py" line="275" /> <source>PyPI Package Management</source> <translation>Gestor de Packages PyPI</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="525" /> - <location filename="../Preferences/ProgramsDialog.py" line="522" /> - <location filename="../Preferences/ProgramsDialog.py" line="506" /> - <location filename="../Preferences/ProgramsDialog.py" line="376" /> - <location filename="../Preferences/ProgramsDialog.py" line="309" /> - <location filename="../Preferences/ProgramsDialog.py" line="292" /> + <location filename="../Preferences/ProgramsDialog.py" line="527" /> + <location filename="../Preferences/ProgramsDialog.py" line="524" /> + <location filename="../Preferences/ProgramsDialog.py" line="508" /> + <location filename="../Preferences/ProgramsDialog.py" line="378" /> + <location filename="../Preferences/ProgramsDialog.py" line="311" /> + <location filename="../Preferences/ProgramsDialog.py" line="294" /> <source>(unknown)</source> <translation>(desconocido)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="296" /> + <location filename="../Preferences/ProgramsDialog.py" line="298" /> <source>Spell Checker - PyEnchant</source> <translation>Corrección Ortográfica - PyEnchant</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="313" /> + <location filename="../Preferences/ProgramsDialog.py" line="315" /> <source>Source Highlighter - Pygments</source> <translation>Resaltador de Código Fuente - Pygments</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="320" /> + <location filename="../Preferences/ProgramsDialog.py" line="322" /> <source>MicroPython - MPY Cross Compiler</source> <translation>MicroPython - MPY Cross Compiler</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="327" /> + <location filename="../Preferences/ProgramsDialog.py" line="329" /> <source>MicroPython - ESP Tool</source> <translation>MicroPython - ESP Tool</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="338" /> + <location filename="../Preferences/ProgramsDialog.py" line="340" /> <source>MicroPython - PyBoard Flasher</source> <translation>MicroPython - PyBoard Flasher</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="348" /> + <location filename="../Preferences/ProgramsDialog.py" line="350" /> <source>MicroPython - STLink Info</source> <translation>MicroPython - STLink Info</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="358" /> + <location filename="../Preferences/ProgramsDialog.py" line="360" /> <source>MicroPython - STLink Flasher</source> <translation>MicroPython - STLink Flasher</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="380" /> + <location filename="../Preferences/ProgramsDialog.py" line="382" /> <source>Code Assistant - Jedi</source> <translation>Asistente de Código - Jedi</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="460" /> + <location filename="../Preferences/ProgramsDialog.py" line="462" /> <source>(not configured)</source> <translation>(no configurado)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="495" /> + <location filename="../Preferences/ProgramsDialog.py" line="497" /> <source>(module not found)</source> <translation>(módule no encontrado)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="528" /> + <location filename="../Preferences/ProgramsDialog.py" line="530" /> <source>(not executable)</source> <translation>(no ejecutable)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="574" /> + <location filename="../Preferences/ProgramsDialog.py" line="576" /> + <location filename="../Preferences/ProgramsDialog.py" line="544" /> <location filename="../Preferences/ProgramsDialog.py" line="542" /> - <location filename="../Preferences/ProgramsDialog.py" line="540" /> <source>(not found)</source> <translation>(no encontrado)</translation> </message> @@ -67063,7 +67185,7 @@ <translation>Alt+R</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="306" /> + <location filename="../Project/PropertiesDialog.py" line="312" /> <location filename="../Project/PropertiesDialog.py" line="71" /> <source>None</source> <translation>Ninguno</translation> @@ -67089,12 +67211,12 @@ <translation>El control de versiones no está disponible para proyectos remotos.</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="261" /> + <location filename="../Project/PropertiesDialog.py" line="267" /> <source>Source Files ({0});;All Files (*)</source> <translation>Archivos fuente ({0});;Todos los archivos (*)</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="265" /> + <location filename="../Project/PropertiesDialog.py" line="271" /> <source>All Files (*)</source> <translation>Todos los archivos (*)</translation> </message> @@ -67135,22 +67257,22 @@ <context> <name>Purge</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="76" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/purge.py" line="83" /> <source>Purge All Files</source> <translation>Purgar Todos los Archivos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="77" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/purge.py" line="84" /> <source>Do really want to delete all files not tracked by Mercurial (including ignored ones)?</source> <translation>¿Desea realmente borrar todos los archivos no rastreados por Mercurial (incluyendo los ignorados)?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="82" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/purge.py" line="89" /> <source>Purge Files</source> <translation>Purgar Archivos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="83" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/purge.py" line="90" /> <source>Do really want to delete files not tracked by Mercurial?</source> <translation>¿Desea realmente borrar los archivos no rastreados por Mercurial ?</translation> </message> @@ -67158,79 +67280,115 @@ <context> <name>PurgeProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="36" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="34" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="36" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="34" /> <source>Purge Files</source> <translation>Purgar Archivos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="43" /> - <source>Delete files and directories not known to Mercurial</source> - <translation>Borrar archivos y directorios no conocidos por Mercurial</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="46" /> - <source><b>Purge Files</b><p>This deletes files and directories not known to Mercurial. That means that purge will delete:<ul><li>unknown files (marked with "not tracked" in the status dialog)</li><li>empty directories</li></ul>Note that ignored files will be left untouched.</p></source> - <translation><b>Purgar Archivos</b><p>Borra archivos y directorios no conocidos por Mercurial. Significa que la purga borrará:<ul><li>archivos desconocidos (marcados con "not tracked" en el diálogo de estado)</li><li>directorios vacíos</li></ul>Note que los archivos ignorados se dejarán sin tocar.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="61" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="60" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="43" /> + <source>Delete not version controlled files and directories</source> + <translation>Borrar archivos y directorios sin control de versiones</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="46" /> + <source><b>Purge Files</b><p>This deletes not version controlled files and directories. That means that purge will delete:<ul><li>not version controlled files (marked with "not tracked" in the status dialog)</li><li>empty directories</li></ul>Note that ignored files will be left untouched.</p></source> + <translation><b>Purgar Archivos</b><p>Esto borra archivos y directorios sin control de versiones. Esto significa que el purge borrará:<ul><li>archivos sin control de versiones (marcados con "no rastreados" en el diálogo de estado)</li><li>directorios vacíos</li></ul>Nota: los archivos ignorados no se van a tocar.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="61" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="60" /> <source>Purge All Files</source> <translation>Purgar Todos los Archivos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="68" /> - <source>Delete files and directories not known to Mercurial including ignored ones</source> - <translation>Borrar todos los archivos no conocidos por Mercurial incluyendo los ignorados</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="74" /> - <source><b>Purge All Files</b><p>This deletes files and directories not known to Mercurial. That means that purge will delete:<ul><li>unknown files (marked with "not tracked" in the status dialog)</li><li>empty directories</li><li>ignored files and directories</li></ul></p></source> - <translation><b>Purgar Todos los Archivos</b><p>Borra archivos y directorios no conocidos por Mercurial. Significa que la purga borrará:<ul><li>archivos desconocidos (marcados con "not tracked" en el diálogo de estado)</li><li>directorios vacíos</li></ul>archivos y directorios ignorados.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="89" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="68" /> + <source>Delete not version controlled files and directories including ignored ones</source> + <translation>Borrar archivos y directorios sin control de versiones incluyendo los ignorados</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="74" /> + <source><b>Purge All Files</b><p>This deletes not version controlled files and directories. That means that purge will delete:<ul><li>not version controlled files (marked with "not tracked" in the status dialog)</li><li>empty directories</li><li>ignored files and directories</li></ul></p></source> + <translation><b>Purgar Todos los Archivos</b><p>Esto borra archivos y directorios sin control de versiones. Esto significa que el purge borrará:<ul><li>archivos sin control de versiones (marcados con "no rastreados" en el diálogo de estado)</li><li>directorios vacíos</li></ul>archivos y directorios ignorados.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="90" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="89" /> + <source>Purge Ignored Files</source> + <translation>Purgar Archivos Ignorados</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="97" /> + <source>Delete ignored files and directories</source> + <translation>Borrar archivos y directorios ignorados</translation> + </message> + <message> + <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><b>Purgar de Archivos Ignorados</b><p>Esto borra archivos y directorios ignorados.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="109" /> <source>List Files to be Purged</source> <translation>Listar Archivos a ser Purgados</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="91" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="111" /> <source>List Files to be Purged...</source> <translation>Listar Archivos a ser Purgados...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="98" /> - <source>List files and directories not known to Mercurial</source> - <translation>Listar archivos y directorios no conocidos por Mercurial</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="101" /> - <source><b>List Files to be Purged</b><p>This lists files and directories not known to Mercurial. These would be deleted by the "Purge Files" menu entry.</p></source> - <translation><b>Listar Archivos a ser Purgados</b><p>Lista archivos y directorios no conocidos por Mercurial. Éstos serían borrados por la entrada de menú "Purgar Archivos".</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="111" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="118" /> + <source>List not version controlled files and directories</source> + <translation>Listar archivos y directorios sin control de versiones</translation> + </message> + <message> + <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><b>Listar Archivos y Directorios a los que hacer Purge</b><p>Esto lista archivos y directorios sin control de versiones. Se podrían borrar con la entrada de menu "Hacer Purge de Archivos".</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="131" /> <source>List All Files to be Purged</source> <translation>Listar Todos los Archivos a ser Purgados</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="112" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="132" /> <source>List All Files to be Purged...</source> <translation>Listar Todos los Archivos a ser Purgados...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="119" /> - <source>List files and directories not known to Mercurial including ignored ones</source> - <translation>Listar archivos y directorios no conocidos por Mercurial incluidos los ignorados</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="125" /> - <source><b>List All Files to be Purged</b><p>This lists files and directories not known to Mercurial including ignored ones. These would be deleted by the "Purge All Files" menu entry.</p></source> - <translation><b>Listar Todos los Archivos a ser Purgados</b><p>Lista archivos y directorios no conocidos por Mercurial incluyendo los ignorados. Éstos serían borrados por la entrada de menú "Purgar Todos los Archivos".</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="163" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="139" /> + <source>List not version controlled files and directories including ignored ones</source> + <translation>Listar archivos y directorios sin control de versiones incluyendo los ignorados</translation> + </message> + <message> + <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><b>Listar Todos los Archivos a Purgar</b><p>Esto lista archivos y directorios sin control de versiones incluyendo los ignorados. Estos se borrarían utilizando la entrada de menu "Purgar Todos los Archivos".</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="156" /> + <source>List Ignored Files to be Purged</source> + <translation>Listar Archivos Ignorados a Purgar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="157" /> + <source>List Ignored Files to be Purged...</source> + <translation>Listar Archivos Ignorados a Purgar...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="164" /> + <source>List ignored files and directories</source> + <translation>Listar archivos y directorios ignorados</translation> + </message> + <message> + <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><b>Listar Archivos Ignorados a Purgar</b><p>Esto lista archivos y directorios ignorados. Éstos serían borrados por la entrada de menú "Purgar Archivos Ignorados".</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="206" /> <source>Purge</source> <translation>Purgar</translation> </message> @@ -76210,49 +76368,49 @@ <context> <name>Shelve</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="105" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="105" /> <source>Shelve current changes</source> <translation>Cambios actuales de shelve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="151" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="151" /> <source>Restore shelved changes</source> <translation>Restaurar cambios de shelve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="170" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="170" /> <source>Abort restore operation</source> <translation>Abortar operación de restore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="191" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="191" /> <source>Continue restore operation</source> <translation>Continuar operación de restores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="211" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="211" /> <source>Select the shelves to be deleted:</source> <translation>Seleccionar los shelves a borrar:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="231" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="222" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="231" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="222" /> <source>Delete shelves</source> <translation>Borrar shelves</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="223" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="223" /> <source>Do you really want to delete these shelves?</source> <translation>¿Desea realmente eliminar estos shelves?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="249" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="242" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="249" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="242" /> <source>Delete all shelves</source> <translation>Borrar todos los shelves</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="243" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="243" /> <source>Do you really want to delete all shelved changes?</source> <translation>¿Desea realmente eliminar todos los cambios en shelve?</translation> </message> @@ -76260,21 +76418,21 @@ <context> <name>ShelveProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="62" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="57" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="52" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="47" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="62" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="57" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="52" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="47" /> <source>Shelve changes</source> <translation>Cambios en shelve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="122" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="74" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="122" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="74" /> <source>Shelve</source> <translation>Shelve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="104" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="104" /> <source>The project should be reread. Do this now?</source> <translation>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation> </message> @@ -76282,154 +76440,154 @@ <context> <name>ShelveProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="34" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="34" /> <source>Shelve changes</source> <translation>Shelve de cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="35" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="35" /> <source>Shelve changes...</source> <translation>Shelve de cambios...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="42" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="42" /> <source>Shelve all current changes of the project</source> <translation>Hacer shelve de todos los cambios actuales del proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="45" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="45" /> <source><b>Shelve changes</b><p>This shelves all current changes of the project.</p></source> <translation><b>Shelve de cambios</b><p>Hace shelve de todos los cambios actuales en el proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="54" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="54" /> <source>Show shelve browser</source> <translation>Mostrar navegador de shelve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="55" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="55" /> <source>Show shelve browser...</source> <translation>Mostrar navegador de shelve...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="61" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="61" /> <source>Show a dialog with all shelves</source> <translation>Mostrar un diálogo con todos los shelves</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="63" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="63" /> <source><b>Show shelve browser...</b><p>This shows a dialog listing all available shelves. Actions on these shelves may be executed via the context menu.</p></source> <translation><b>Mostrar navegador de shelve...</b><p>Muestra un diálogo con un listado de todos los shelves disponibles. A través del menú de contexto, se pueden ejecutar acciones sobre estos shelves.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="74" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="74" /> <source>Restore shelved change</source> <translation>Restaurar cambio en shelve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="75" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="75" /> <source>Restore shelved change...</source> <translation>Restaurar cambio en shelve...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="82" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="82" /> <source>Restore a shelved change to the project directory</source> <translation>Restaurar un cambio en shelve al directorio de proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="85" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="85" /> <source><b>Restore shelved change</b><p>This restore a shelved change to the project directory.</p></source> <translation><b>Restaurar cambio en shelve</b><p>Restaura un cambio en shelve al directorio de proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="95" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="95" /> <source>Abort restore</source> <translation>Abortar restore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="96" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="96" /> <source>Abort restore...</source> <translation>Abortar restore...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="103" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="103" /> <source>Abort the restore operation in progress</source> <translation>Abortar la operación de restore en progreso</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="106" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="106" /> <source><b>Abort restore</b><p>This aborts the restore operation in progress and reverts already applied changes.</p></source> <translation><b>Abortar restore</b><p>Aborta la operación de restore en progreso y revierte los cambios que ya se hayan aplicado.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="116" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="116" /> <source>Continue restore</source> <translation>Continuar restore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="117" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="117" /> <source>Continue restore...</source> <translation>Continuar restore...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="124" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="124" /> <source>Continue the restore operation in progress</source> <translation>Continuar la operación de restore en curso</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="127" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="127" /> <source><b>Continue restore</b><p>This continues the restore operation in progress.</p></source> <translation><b>Continuar restore</b><p>Reanuda la operación de restore en curso.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="136" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="136" /> <source>Delete shelved changes</source> <translation>Borrar cambios en shelve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="137" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="137" /> <source>Delete shelved changes...</source> <translation>Borrar cambios en shelve...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="144" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="144" /> <source><b>Delete shelved changes...</b><p>This opens a dialog to select the shelved changes to delete and deletes the selected ones.</p></source> <translation><b>Borrar cambios en shelve...</b><p>Abre un diálogo para seleccionar cambios en shelve y borrarlos.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="155" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="154" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="155" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="154" /> <source>Delete ALL shelved changes</source> <translation>Borrar TODOS los cambios en shelve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="162" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="162" /> <source><b>Delete ALL shelved changes</b><p>This deletes all shelved changes.</p></source> <translation><b>Borrar TODOS los cambios en shelve</b><p>Borra todos los cambios en shelve.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="231" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="202" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="231" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="202" /> <source>Shelve</source> <translation>Shelve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="218" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="218" /> <source>The project should be reread. Do this now?</source> <translation>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="244" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="244" /> <source>Unshelve</source> <translation>Unshelve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="251" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="251" /> <source>Abort Unshelve</source> <translation>Abortar Unshelve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="258" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="258" /> <source>Continue Unshelve</source> <translation>Continuar Unshelve</translation> </message> @@ -78888,7 +79046,7 @@ <message> <location filename="../VCS/StatusWidget.py" line="211" /> <source>not tracked</source> - <translation>sin seguimiento</translation> + <translation>no rastreados</translation> </message> <message> <location filename="../VCS/StatusWidget.py" line="212" /> @@ -79071,44 +79229,6 @@ </message> </context> <context> - <name>Strip</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/strip.py" line="68" /> - <source>Stripping changesets from repository</source> - <translation>Haciendo strip de changesets desde el repositorio</translation> - </message> - </context> - <context> - <name>StripProjectHelper</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="37" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="35" /> - <source>Strip changesets</source> - <translation>Hacer strip de changesets</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="43" /> - <source>Strip changesets from a repository</source> - <translation>Hacer strip de changesets desde un repositorio</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="45" /> - <source><b>Strip changesets</b><p>This deletes a changeset and all its descendants from a repository. Each removed changeset will be stored in .hg/strip-backup as a bundle file.</p></source> - <translation><b>Hacer strip de changesets</b><p>Borra un changeset y todos sus descendientes de un repositorio. Cada changeset que se elimina se almacenará en .hg/strip-backup como archivo de bundle.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="91" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="79" /> - <source>Strip</source> - <translation>Strip</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="92" /> - <source>The project should be reread. Do this now?</source> - <translation>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation> - </message> - </context> - <context> <name>SubstyleDefinitionDialog</name> <message> <location filename="../Preferences/SubstyleDefinitionDialog.py" line="44" /> @@ -80219,12 +80339,12 @@ <context> <name>SvnDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="165" /> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="168" /> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="166" /> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="169" /> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> @@ -90711,6 +90831,66 @@ </message> </context> <context> + <name>Uncommit</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/uncommit.py" line="64" /> + <source>Undo Local Commit</source> + <translation>Deshacer Commit Local</translation> + </message> + </context> + <context> + <name>UncommitProjectBrowserHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="145" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="82" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="72" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="62" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="52" /> + <source>Undo Local Commit</source> + <translation>Deshacer Commit Local</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="96" /> + <source>Uncommit</source> + <translation>Uncommit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="126" /> + <source>The project should be reread. Do this now?</source> + <translation>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation> + </message> + </context> + <context> + <name>UncommitProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="107" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="38" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="36" /> + <source>Undo Local Commit</source> + <translation>Deshacer Commit Local</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="44" /> + <source>Undo the effect of a local commit.</source> + <translation>Deshacer el effecto de un commit local.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="46" /> + <source><b>Undo Local Commit</b><p>This undoes the effect of a local commit, returning the affected files to their uncommitted state.</p></source> + <translation><b>Deshacer Commit Local</b><p>Esto deshace el efecto de un commit local, retornando los archivos afectados a su estado anterior al commit.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="79" /> + <source>Uncommit</source> + <translation>Uncommit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="95" /> + <source>The project should be reread. Do this now?</source> + <translation>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation> + </message> + </context> + <context> <name>UnittestExecutor</name> <message> <location filename="../Testing/Interfaces/UnittestExecutor.py" line="52" /> @@ -91358,7 +91538,7 @@ <translation><b>Guardar sesión...</b><p>Guarda la sesión actual a disco. Se muestra un diálogo para seleccionar el nombre de archivo.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7892" /> + <location filename="../UI/UserInterface.py" line="7893" /> <location filename="../UI/UserInterface.py" line="1955" /> <location filename="../UI/UserInterface.py" line="1948" /> <source>Load session</source> @@ -92686,8 +92866,8 @@ <translation><b>Atajos de Teclado</b><p>Establezca los atajos de teclado para la aplicación con sus valores preferidos.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7600" /> - <location filename="../UI/UserInterface.py" line="7581" /> + <location filename="../UI/UserInterface.py" line="7601" /> + <location filename="../UI/UserInterface.py" line="7582" /> <location filename="../UI/UserInterface.py" line="3402" /> <source>Export Keyboard Shortcuts</source> <translation>Exportar Atajos de Teclado</translation> @@ -92708,7 +92888,7 @@ <translation><b>Exportar Atajos de Teclado</b><p>Exporte los atajos de teclado de la aplicación.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7619" /> + <location filename="../UI/UserInterface.py" line="7620" /> <location filename="../UI/UserInterface.py" line="3421" /> <source>Import Keyboard Shortcuts</source> <translation>Importar Atajos de Teclado</translation> @@ -93441,169 +93621,169 @@ </translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7108" /> - <location filename="../UI/UserInterface.py" line="7046" /> - <location filename="../UI/UserInterface.py" line="7002" /> - <location filename="../UI/UserInterface.py" line="6928" /> - <location filename="../UI/UserInterface.py" line="6864" /> - <source>Documentation Missing</source> - <translation>Falta documentación</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="7109" /> <location filename="../UI/UserInterface.py" line="7047" /> <location filename="../UI/UserInterface.py" line="7003" /> <location filename="../UI/UserInterface.py" line="6929" /> <location filename="../UI/UserInterface.py" line="6865" /> + <source>Documentation Missing</source> + <translation>Falta documentación</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7110" /> + <location filename="../UI/UserInterface.py" line="7048" /> + <location filename="../UI/UserInterface.py" line="7004" /> + <location filename="../UI/UserInterface.py" line="6930" /> + <location filename="../UI/UserInterface.py" line="6866" /> <source><p>The documentation starting point "<b>{0}</b>" could not be found.</p></source> <translation><P>El punto de entrada de documentación "<b>{0}</b>" no ha podido encontrarse.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7090" /> - <location filename="../UI/UserInterface.py" line="6972" /> - <source>Documentation</source> - <translation>Documentación</translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="6973" /> - <source><p>The PyQt{0} documentation starting point has not been configured.</p></source> - <translation><P>El punto de entrada de documentación de PyQt{0} no ha sido configurado.</p></translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="7091" /> + <location filename="../UI/UserInterface.py" line="6973" /> + <source>Documentation</source> + <translation>Documentación</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="6974" /> + <source><p>The PyQt{0} documentation starting point has not been configured.</p></source> + <translation><P>El punto de entrada de documentación de PyQt{0} no ha sido configurado.</p></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7092" /> <source><p>The PySide{0} documentation starting point has not been configured.</p></source> <translation><P>El punto de entrada de documentación de PySide{0} no ha sido configurado.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7270" /> - <location filename="../UI/UserInterface.py" line="7206" /> - <source>Start Web Browser</source> - <translation>Iniciar Navegador Web</translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="7207" /> - <source>The eric web browser could not be started.</source> - <translation>El navegador web de eric no se ha podido iniciar.</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="7271" /> + <location filename="../UI/UserInterface.py" line="7207" /> + <source>Start Web Browser</source> + <translation>Iniciar Navegador Web</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7208" /> + <source>The eric web browser could not be started.</source> + <translation>El navegador web de eric no se ha podido iniciar.</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7272" /> <source><p>The eric web browser is not started.</p><p>Reason: {0}</p></source> <translation><p>El navegador web de eric no se ha iniciado.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7317" /> + <location filename="../UI/UserInterface.py" line="7318" /> <source>Open Browser</source> <translation>Abrir Navegador</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7317" /> + <location filename="../UI/UserInterface.py" line="7318" /> <source>Could not start a web browser</source> <translation>No se ha podido iniciar el navegador web</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7621" /> - <location filename="../UI/UserInterface.py" line="7583" /> + <location filename="../UI/UserInterface.py" line="7622" /> + <location filename="../UI/UserInterface.py" line="7584" /> <source>Keyboard Shortcuts File (*.ekj)</source> <translation>Archivo de Atajos de Teclado (*.ekj)</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7601" /> + <location filename="../UI/UserInterface.py" line="7602" /> <source><p>The keyboard shortcuts file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>El archivo de atajos de teclado <b>{0}</b> ya existe. ¿Sobreescribirlo?</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7805" /> + <location filename="../UI/UserInterface.py" line="7806" /> <source>Load crash session...</source> <translation>Cargar sesión perdida...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7808" /> + <location filename="../UI/UserInterface.py" line="7809" /> <source>Clean crash sessions...</source> <translation>Limpiar sesiones perdidas...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7845" /> - <source>Read Session</source> - <translation>Cargar sesión</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="7846" /> + <source>Read Session</source> + <translation>Cargar sesión</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7847" /> <source><p>The session file <b>{0}</b> could not be read.</p></source> <translation><p>El archivo de sesión <b></b> no ha podido ser leído.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7869" /> + <location filename="../UI/UserInterface.py" line="7870" /> <source>Save Session</source> <translation>Guardar Sesión</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7894" /> - <location filename="../UI/UserInterface.py" line="7871" /> + <location filename="../UI/UserInterface.py" line="7895" /> + <location filename="../UI/UserInterface.py" line="7872" /> <source>eric Session Files (*.esj)</source> <translation>Archivos de Sesión de eric (*.esj)</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7963" /> - <source>Found Crash Sessions</source> - <translation>Encontradas Sesiones Perdidas</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="7964" /> + <source>Found Crash Sessions</source> + <translation>Encontradas Sesiones Perdidas</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7965" /> <source>These crash session files were found. Select the one to open. Select 'Cancel' to not open a crash session.</source> <translation>Se han encontrado estos archivos de sesiones perdidas. Seleccionar la que se desee abrir. Seleccionar 'Cancelar' para no abrir ninguna.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="8037" /> - <source>Clean stale crash sessions</source> - <translation>Limpiar sesiones perdidas antituas</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="8038" /> + <source>Clean stale crash sessions</source> + <translation>Limpiar sesiones perdidas antituas</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8039" /> <source>Do you really want to delete these stale crash session files?</source> <translation>¿Desea realmente eliminar esos archivos antiguos de sesiones perdidas?</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="8414" /> - <source>Drop Error</source> - <translation>Error de volcado</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="8415" /> + <source>Drop Error</source> + <translation>Error de volcado</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8416" /> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> no es un archivo.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="8612" /> - <source>Upgrade available</source> - <translation>Actualización disponible</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="8613" /> + <source>Upgrade available</source> + <translation>Actualización disponible</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8614" /> <source><p>A newer version of the <b>eric-ide</b> package is available at <a href="{0}/eric-ide/">PyPI</a>.</p><p>Installed: {1}<br/>Available: <b>{2}</b></p><p>Shall <b>eric-ide</b> be upgraded?</p></source> <translation><p>Una versión más moderna del package de <b>eric-ide</b> se encuentra disponible en <a href="{0}/eric-ide/">PyPI</a>.</p><p>Instalado: {1}<br/>Disponible: <b>{2}</b>Actualizar <b>eric-ide</b>?</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="8661" /> - <source>First time usage</source> - <translation>Usado por primera vez</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="8662" /> + <source>First time usage</source> + <translation>Usado por primera vez</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8663" /> <source>eric has not been configured yet. The configuration dialog will be started.</source> <translation>eric todavía no está configurado. El diálogo de configuración va a ser iniciado.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="8684" /> + <location filename="../UI/UserInterface.py" line="8685" /> <source>Select Workspace Directory</source> <translation>Seleccionar Directorio para el Espacio de Trabajo</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="8852" /> - <source>Unsaved Data Detected</source> - <translation>Detectados Datos sin Guardar</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="8853" /> + <source>Unsaved Data Detected</source> + <translation>Detectados Datos sin Guardar</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8854" /> <source>Some editors contain unsaved data. Shall these be saved?</source> <translation>Algunos editores contienen datos sin guardar. ¿Desea guardarlos?</translation> </message> @@ -100644,8 +100824,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>&Browsing History</source> - <translation>&Historial de Navegación</translation> + <source>Browsing History</source> + <translation>Historial de Navegación</translation> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100684,8 +100864,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>&Search History</source> - <translation>&Historial de &Búsqueda</translation> + <source>Search History</source> + <translation>Historial de Búsqueda</translation> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100694,8 +100874,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>Download &History</source> - <translation>Descargar &Historial</translation> + <source>Download History</source> + <translation>Historial de Descargas</translation> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100704,8 +100884,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>&Cookies</source> - <translation>&Cookies</translation> + <source>Cookies</source> + <translation>Cookies</translation> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100714,8 +100894,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>Cached &Web Pages</source> - <translation>Páginas &Web en caché</translation> + <source>Cached Web Pages</source> + <translation>Páginas Web en Caché</translation> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100724,8 +100904,18 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>Website &Icons</source> - <translation>&Iconos de Website</translation> + <source>Website Icons</source> + <translation>Iconos del Sitio Web</translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> + <source>Select to clear the website permissions</source> + <translation>Seleccionar para limpiar los permisos del sitio web</translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> + <source>Website Permissions</source> + <translation>Permisos del Sitio Web</translation> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100734,8 +100924,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>Saved &Passwords</source> - <translation>&Contraseñas Almacenadas</translation> + <source>Saved Passwords</source> + <translation>Contraseñas Almacenadas</translation> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100744,8 +100934,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>&Zoom Settings</source> - <translation>Ajustes de &Zoom</translation> + <source>Zoom Settings</source> + <translation>Ajustes de Zoom</translation> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -101288,6 +101478,16 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/WebBrowserPage.ui" line="0" /> + <source>Select to store website permission settings in memory only.</source> + <translation>Seleccionar para almacenar ajustes de permisos del website solo en memoria.</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserPage.ui" line="0" /> + <source>Do not persist website permissions</source> + <translation>No persistir permisos del website</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserPage.ui" line="0" /> <source><p>Select to allow reading from all canvas elements.</p> <p><b>Note:</b> Disable this option to prevent canvas fingerprinting.</p></source> <translation><p>Seleccionar para habilitar la lectura de todos los elementos del lienzo.</p> @@ -101718,32 +101918,87 @@ <translation><b>Nota:</b> El establecimiento de un valor alto para el divisor hará más lento el desplazamiento de pantalla.</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="194" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="78" /> + <source><p>Allow <b>{0}</b> to access your location information?</p></source> + <translation><p>¿Permitir a <b>{0}</b> acceso a información de ubicación?</p></translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="83" /> + <source><p>Allow <b>{0}</b> to access your microphone?</p></source> + <translation><p>¿Permitir a <b>{0}</b> acceso al micrófono?</p></translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="89" /> + <source><p>Allow <b>{0}</b> to access your webcam?</p></source> + <translation><p>¿Permitir a <b>{0}</b> acceso a la webcam?</p></translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="95" /> + <source><p>Allow <b>{0}</b> to access your microphone and webcam?</p></source> + <translation><p>¿Permitir a <b>{0}</b> acceso al micrófono y a la webcam?</p></translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="100" /> + <source><p>Allow <b>{0}</b> to lock your mouse cursor?</p></source> + <translation><p>¿Permitir a <b>{0}</b> acceso al puntero del ratón?</p></translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="105" /> + <source><p>Allow <b>{0}</b> to capture video of your desktop?</p></source> + <translation><p>¿Permitir a <b>{0}</b> capturar vídeo del escritorio?</p></translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="111" /> + <source><p>Allow <b>{0}</b> to capture audio and video of your desktop?</p></source> + <translation><p>¿Permitir a <b>{0}</b> capturar audio y vídeo del escritorio?</p></translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="118" /> + <source><p>Allow <b>{0}</b> to show notifications on your desktop?</p></source> + <translation><p>¿Permitir a <b>{0}</b> mostrar notificaciones en el escritorio?</p></translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="124" /> + <source><p>Allow <b>{0}</b> to read from and write to the clipboard?</p></source> + <translation><p>¿Permitir a <b>{0}</b> ñeer desde y escribir al portapapeles?</p></translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="130" /> + <source><p>Allow <b>{0}</b> to access fonts stored on this machine?</p></source> + <translation><p>¿Permitir a <b>{0}</b> acceso a las fuentes almacenadas en este ordenador?</p></translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="269" /> <source>Suspicuous URL detected</source> <translation>Detectada URL sospechosa</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="195" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="270" /> <source><p>The URL <b>{0}</b> was found in the Safe Browsing database.</p>{1}</source> <translation><p>La URL <b>{0}</b> se ha encontrado en la base de datos de Navegación Segura.</p>{1}</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="541" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="396" /> + <source>Permission Request</source> + <translation>Solicitud de Permiso</translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="636" /> <source>Register Protocol Handler</source> <translation>Registrar Gestor de Protocolo</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="542" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="637" /> <source><p>Allow the Web Site <b>{0}</b> to handle all <b>{1}</b> links?</p></source> <translation><p>¿Permitir al Sitio Web <b>{0}</b> gestionar todos los enlaces <b>{1}</b>?</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="631" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="726" /> <source>SSL Info</source> <translation>SSL Info</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="632" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="727" /> <source>This site does not contain SSL information.</source> <translation>Este site no contiene información SSL.</translation> </message> @@ -104339,15 +104594,15 @@ <translation>Analizar sitio actual</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5231" /> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5221" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5248" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5238" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2220" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2218" /> <source>IP Address Report</source> <translation>Informe de Dirección IP</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5245" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5262" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2232" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2230" /> <source>Domain Report</source> @@ -104374,8 +104629,8 @@ <translation><b>Atajos de Teclado</b><p>Establezca los atajos de teclado para la aplicación con sus valores preferidos.</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5651" /> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5632" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5675" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5656" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2270" /> <source>Export Keyboard Shortcuts</source> <translation>Exportar Atajos de Teclado</translation> @@ -104396,7 +104651,7 @@ <translation><b>Exportar Atajos de Teclado</b><p>Exportar los atajos de teclado de la aplicación.</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5671" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5695" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2289" /> <source>Import Keyboard Shortcuts</source> <translation>Importar Atajos de Teclado</translation> @@ -104647,100 +104902,100 @@ <translation>Motor de Ayuda</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4768" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4785" /> <source>System</source> <translation>Sistema</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4772" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4789" /> <source>ISO</source> <translation>ISO</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4775" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4792" /> <source>Unicode</source> <translation>Unicode</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4778" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4795" /> <source>Windows</source> <translation>Windows</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4781" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4798" /> <source>IBM</source> <translation>IBM</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4784" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4801" /> <source>Apple</source> <translation>Apple</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4787" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4804" /> <source>Other</source> <translation>Otro</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4814" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4831" /> <source>Menu Bar</source> <translation>Barra de Menú</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4819" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4836" /> <source>Bookmarks</source> <translation>Marcadores</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4824" /> - <source>Status Bar</source> - <translation>Barra de Estado</translation> - </message> - <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4839" /> - <source>&Show all</source> - <translation>Mo&strar todo</translation> - </message> - <message> <location filename="../WebBrowser/WebBrowserWindow.py" line="4841" /> + <source>Status Bar</source> + <translation>Barra de Estado</translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4856" /> + <source>&Show all</source> + <translation>Mo&strar todo</translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4858" /> <source>&Hide all</source> <translation>&Ocultar todo</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5187" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5204" /> <source>VirusTotal Scan</source> <translation>Análisis con VirusTotal</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5188" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5205" /> <source><p>The VirusTotal scan could not be scheduled.<p> <p>Reason: {0}</p></source> <translation><p>El análisis con VirusTotal no se ha podido programar.<p> <p>Razón: {0}</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5222" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5239" /> <source>Enter a valid IPv4 address in dotted quad notation:</source> <translation>Introducir una dirección IPv4 válida en notación decimal punteada:</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5232" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5249" /> <source>The given IP address is not in dotted quad notation.</source> <translation>La dirección IP no se ha proporcionado en notación decimal punteada.</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5246" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5263" /> <source>Enter a valid domain name:</source> <translation>Introducir un nombre de dominio válido:</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5673" /> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5634" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5697" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5658" /> <source>Keyboard Shortcuts File (*.ekj)</source> <translation>Archivo de Atajos de Teclado (*.ekj)</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5652" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5676" /> <source><p>The keyboard shortcuts file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>El archivo de atajos de teclado <b>{0}</b> ya existe. ¿Sobreescribirlo?</p></translation> </message> @@ -105844,32 +106099,32 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1383" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1389" /> <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>Padre #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1955" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1391" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1964" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397" /> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Etiquetas</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1961" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1970" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1403" /> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Marcadores</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1968" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1404" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1977" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1410" /> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branches</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1410" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1416" /> <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> @@ -105878,7 +106133,7 @@ <tr><td><b>Hora de commit</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1429" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1435" /> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -105895,38 +106150,38 @@ </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1929" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1938" /> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation><tr><td><b>Head #{0}</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1936" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945" /> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation><tr><td><b>Parent #{0}</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1943" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1952" /> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Pista</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1948" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1957" /> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Changeset</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1975" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1984" /> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Padres</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1981" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990" /> <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>
--- a/src/eric7/i18n/eric7_fr.ts Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/i18n/eric7_fr.ts Tue Jan 14 17:29:56 2025 +0100 @@ -7734,18 +7734,18 @@ <translation>Graphiques</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="896" /> + <location filename="../Preferences/ConfigurationDialog.py" line="903" /> <location filename="../Preferences/ConfigurationDialog.py" line="228" /> <source>Hex Editor</source> <translation>Hex Editor</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1129" /> - <location filename="../Preferences/ConfigurationDialog.py" line="1090" /> - <location filename="../Preferences/ConfigurationDialog.py" line="982" /> - <location filename="../Preferences/ConfigurationDialog.py" line="944" /> - <location filename="../Preferences/ConfigurationDialog.py" line="913" /> - <location filename="../Preferences/ConfigurationDialog.py" line="882" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1136" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1097" /> + <location filename="../Preferences/ConfigurationDialog.py" line="989" /> + <location filename="../Preferences/ConfigurationDialog.py" line="951" /> + <location filename="../Preferences/ConfigurationDialog.py" line="920" /> + <location filename="../Preferences/ConfigurationDialog.py" line="889" /> <location filename="../Preferences/ConfigurationDialog.py" line="785" /> <location filename="../Preferences/ConfigurationDialog.py" line="670" /> <location filename="../Preferences/ConfigurationDialog.py" line="235" /> @@ -7763,7 +7763,7 @@ <translation>Fenêtre de log</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1104" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1111" /> <location filename="../Preferences/ConfigurationDialog.py" line="250" /> <source>MicroPython</source> <translation type="unfinished">MicroPython</translation> @@ -7780,8 +7780,9 @@ <translation>Réseau</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1111" /> - <location filename="../Preferences/ConfigurationDialog.py" line="958" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1118" /> + <location filename="../Preferences/ConfigurationDialog.py" line="965" /> + <location filename="../Preferences/ConfigurationDialog.py" line="806" /> <location filename="../Preferences/ConfigurationDialog.py" line="271" /> <source>Network Proxy</source> <translation type="unfinished">Proxy réseau</translation> @@ -7792,13 +7793,13 @@ <translation>Notifications</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="927" /> + <location filename="../Preferences/ConfigurationDialog.py" line="934" /> <location filename="../Preferences/ConfigurationDialog.py" line="285" /> <source>PDF Viewer</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="965" /> + <location filename="../Preferences/ConfigurationDialog.py" line="972" /> <location filename="../Preferences/ConfigurationDialog.py" line="292" /> <source>Python Package Management</source> <translation>Gestion des packages Python</translation> @@ -7809,7 +7810,7 @@ <translation>Gestionnaire de plugins</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="806" /> + <location filename="../Preferences/ConfigurationDialog.py" line="813" /> <location filename="../Preferences/ConfigurationDialog.py" line="684" /> <location filename="../Preferences/ConfigurationDialog.py" line="306" /> <source>Printer</source> @@ -7826,13 +7827,13 @@ <translation>Qt</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="813" /> + <location filename="../Preferences/ConfigurationDialog.py" line="820" /> <location filename="../Preferences/ConfigurationDialog.py" line="321" /> <source>Security</source> <translation type="unfinished">Sécurité</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="996" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1003" /> <location filename="../Preferences/ConfigurationDialog.py" line="328" /> <source>Shell</source> <translation>Shell</translation> @@ -7848,7 +7849,7 @@ <translation>Gabarits</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="865" /> + <location filename="../Preferences/ConfigurationDialog.py" line="872" /> <location filename="../Preferences/ConfigurationDialog.py" line="343" /> <source>Tray Starter</source> <translation type="unfinished" /> @@ -7864,7 +7865,7 @@ <translation>Débogueur</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1003" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1010" /> <location filename="../Preferences/ConfigurationDialog.py" line="698" /> <location filename="../Preferences/ConfigurationDialog.py" line="399" /> <location filename="../Preferences/ConfigurationDialog.py" line="364" /> @@ -7899,14 +7900,14 @@ <translation>Gestion des fichiers</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1010" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1017" /> <location filename="../Preferences/ConfigurationDialog.py" line="712" /> <location filename="../Preferences/ConfigurationDialog.py" line="413" /> <source>Searching</source> <translation>Recherche</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="848" /> + <location filename="../Preferences/ConfigurationDialog.py" line="855" /> <location filename="../Preferences/ConfigurationDialog.py" line="719" /> <location filename="../Preferences/ConfigurationDialog.py" line="648" /> <location filename="../Preferences/ConfigurationDialog.py" line="420" /> @@ -7914,7 +7915,7 @@ <translation>Correction orthographique</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1017" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1024" /> <location filename="../Preferences/ConfigurationDialog.py" line="726" /> <location filename="../Preferences/ConfigurationDialog.py" line="427" /> <source>Style</source> @@ -7937,14 +7938,14 @@ <translation>Exportation</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1024" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1031" /> <location filename="../Preferences/ConfigurationDialog.py" line="455" /> <source>Autocompletion</source> <translation>Autocomplétion</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1045" /> - <location filename="../Preferences/ConfigurationDialog.py" line="1031" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1052" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1038" /> <location filename="../Preferences/ConfigurationDialog.py" line="483" /> <location filename="../Preferences/ConfigurationDialog.py" line="462" /> <source>QScintilla</source> @@ -7958,13 +7959,13 @@ <translation type="unfinished">Jedi</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1038" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1045" /> <location filename="../Preferences/ConfigurationDialog.py" line="476" /> <source>Calltips</source> <translation>Calltips</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1052" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1059" /> <location filename="../Preferences/ConfigurationDialog.py" line="740" /> <location filename="../Preferences/ConfigurationDialog.py" line="497" /> <source>Highlighters</source> @@ -7977,21 +7978,21 @@ <translation>Types de fichiers</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1059" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1066" /> <location filename="../Preferences/ConfigurationDialog.py" line="754" /> <location filename="../Preferences/ConfigurationDialog.py" line="511" /> <source>Styles</source> <translation>Styles</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1066" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1073" /> <location filename="../Preferences/ConfigurationDialog.py" line="761" /> <location filename="../Preferences/ConfigurationDialog.py" line="518" /> <source>Keywords</source> <translation>Mots-clef</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1073" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1080" /> <location filename="../Preferences/ConfigurationDialog.py" line="768" /> <location filename="../Preferences/ConfigurationDialog.py" line="525" /> <source>Properties</source> @@ -8008,7 +8009,7 @@ <translation>Aide</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="820" /> + <location filename="../Preferences/ConfigurationDialog.py" line="827" /> <location filename="../Preferences/ConfigurationDialog.py" line="553" /> <source>Help Documentation</source> <translation>Sources de documentation</translation> @@ -8035,12 +8036,12 @@ <translation>Multi-projet</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1136" /> - <location filename="../Preferences/ConfigurationDialog.py" line="1097" /> - <location filename="../Preferences/ConfigurationDialog.py" line="989" /> - <location filename="../Preferences/ConfigurationDialog.py" line="951" /> - <location filename="../Preferences/ConfigurationDialog.py" line="920" /> - <location filename="../Preferences/ConfigurationDialog.py" line="889" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1143" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1104" /> + <location filename="../Preferences/ConfigurationDialog.py" line="996" /> + <location filename="../Preferences/ConfigurationDialog.py" line="958" /> + <location filename="../Preferences/ConfigurationDialog.py" line="927" /> + <location filename="../Preferences/ConfigurationDialog.py" line="896" /> <location filename="../Preferences/ConfigurationDialog.py" line="792" /> <location filename="../Preferences/ConfigurationDialog.py" line="677" /> <location filename="../Preferences/ConfigurationDialog.py" line="602" /> @@ -8059,47 +8060,47 @@ <translation>Navigateur Web</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="827" /> + <location filename="../Preferences/ConfigurationDialog.py" line="834" /> <location filename="../Preferences/ConfigurationDialog.py" line="627" /> <source>Appearance</source> <translation>Apparence</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="834" /> - <location filename="../Preferences/ConfigurationDialog.py" line="634" /> - <source>eric Web Browser</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Preferences/ConfigurationDialog.py" line="841" /> + <location filename="../Preferences/ConfigurationDialog.py" line="634" /> + <source>eric Web Browser</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationDialog.py" line="848" /> <location filename="../Preferences/ConfigurationDialog.py" line="641" /> <source>VirusTotal Interface</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1228" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1235" /> <source>Enter search text...</source> <translation>Entrer le texte de recherche...</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1303" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1310" /> <source>Preferences</source> <translation>Préférences</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1309" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1316" /> <source>Please select an entry of the list to display the configuration page.</source> <translation>Choisir une entrée dans la liste pour afficher la page de configuration.</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1392" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1399" /> <source>Configuration Page Error</source> <translation>Erreur de la page de configuration</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1393" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1400" /> <source><p>The configuration page <b>{0}</b> could not be loaded.</p></source> <translation><p>La page de configuration <b>{0}</b> n'a pas pu être chargée.</p></translation> </message> @@ -10672,12 +10673,12 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="1691" /> + <location filename="../Debugger/DebuggerInterfacePython.py" line="1692" /> <source>Debug Protocol Error</source> <translation type="unfinished" /> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="1692" /> + <location filename="../Debugger/DebuggerInterfacePython.py" line="1693" /> <source><p>The response received from the debugger backend could not be decoded. Please report this issue with the received data to the eric bugs email address.</p><p>Error: {0}</p><p>Data:<br/>{1}</p></source> <translation type="unfinished" /> </message> @@ -22702,64 +22703,147 @@ </message> </context> <context> + <name>Fastexport</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="183" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="174" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="168" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="159" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="133" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="113" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="57" /> + <source>Mercurial Fastexport</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="58" /> + <source><p>The output file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="107" /> + <source>Cancel</source> + <translation type="unfinished">Annuler</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="110" /> + <source>%v/%m Changesets</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="116" /> + <source>Exporting repository (time remaining: {0}) ...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="134" /> + <source><p>The repository fastexport process sent an error message.</p><p>{0}</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="160" /> + <source><p>The repository fastexport process finished successfully.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="169" /> + <source><p>The repository fastexport process was cancelled.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="175" /> + <source><p>The repository fastexport process finished with exit code <b>{0}</b>.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="184" /> + <source><p>The repository fastexport process crashed.</p></source> + <translation type="unfinished" /> + </message> + </context> + <context> + <name>FastexportProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="37" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="35" /> + <source>Export to git</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="44" /> + <source>Export the repository as git fast-import stream.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="47" /> + <source><b>Export to git</b><p>This exports the repository as a git fast-import stream.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="79" /> + <source>Fastexport</source> + <translation type="unfinished" /> + </message> + </context> + <context> <name>FeaturePermissionBar</name> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="48" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="50" /> <source>{0} wants to use your position.</source> <translation>{0} souhaite utiliser votre position.</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="51" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="53" /> <source>{0} wants to use your microphone.</source> <translation>{0} souhaite utiliser votre microphone.</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="54" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="56" /> <source>{0} wants to use your camera.</source> <translation>{0} souhaite utiliser votre caméra.</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="57" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="59" /> <source>{0} wants to use your microphone and camera.</source> <translation>{0} souhaite utiliser votre microphone et caméra.</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="60" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="62" /> <source>{0} wants to lock your mouse.</source> <translation /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="61" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="63" /> <source>{0} wants to capture video of your screen.</source> <translation>{0} souhaite capturer la vidéo de votre écran.</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="64" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="66" /> <source>{0} wants to capture audio and video of your screen.</source> <translation>{0} souhaite capturer l'audio et la vidéo de votre écran.</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="67" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="69" /> <source>{0} wants to use desktop notifications.</source> <translation>{0} souhaite utiliser les notifications de bureau.</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="92" /> - <source>Remember</source> - <translation>Se rappeler</translation> - </message> - <message> <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="94" /> + <source>Remember</source> + <translation>Se rappeler</translation> + </message> + <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="96" /> <source>Allow</source> <translation>Autoriser</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="95" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="97" /> <source>Deny</source> <translation>Refuser</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="120" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="122" /> <source>{0} wants to use an unknown feature.</source> <translation>{0} souhaite utiliser une fonction inconnue.</translation> </message> @@ -22767,80 +22851,106 @@ <context> <name>FeaturePermissionsDialog</name> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="161" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="143" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="127" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="109" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="93" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="79" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="65" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="49" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="208" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="190" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="170" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="152" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="136" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="118" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="102" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="88" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="74" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="58" /> <source>Host</source> <translation type="unfinished">Hôte</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="162" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="144" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="128" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="110" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="94" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="80" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="66" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="50" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="209" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="191" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="171" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="153" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="137" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="119" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="103" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="89" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="75" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="59" /> <source>Permission</source> <translation>Permission</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="54" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="63" /> <source>Notifications</source> <translation>Notifications</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="68" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="77" /> <source>Geolocation</source> <translation>Géolocalisation</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="82" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="91" /> <source>Microphone</source> <translation>Microphone</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="96" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="105" /> <source>Camera</source> <translation>Caméra</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="114" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="123" /> <source>Microphone && Camera</source> <translation>Microphone && Caméra</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="130" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="139" /> <source>Mouse Lock</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="148" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="157" /> <source>Desktop Video</source> <translation>Vidéo du bureau</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="166" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="175" /> <source>Desktop Audio && Video</source> <translation>Audio && vidéo du bureau</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="181" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="195" /> + <source>Clipboard</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="213" /> + <source>Local Fonts</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="296" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="253" /> <source>Allow</source> <translation>Autoriser</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="182" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="297" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="254" /> <source>Deny</source> <translation>Refuser</translation> </message> <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="255" /> + <source>Always Ask</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="256" /> + <source>Invalid</source> + <translation type="unfinished" /> + </message> + <message> <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.ui" line="0" /> <source>HTML5 Feature Permissions</source> <translation type="unfinished" /> @@ -24711,74 +24821,74 @@ <translation type="unfinished">{0} ({1})</translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="750" /> + <location filename="../UI/FindFileWidget.py" line="749" /> <source>Invalid search expression</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/FindFileWidget.py" line="751" /> + <location filename="../UI/FindFileWidget.py" line="750" /> <source><p>The search expression is not valid.</p><p>Error: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/FindFileWidget.py" line="878" /> + <location filename="../UI/FindFileWidget.py" line="877" /> <source>{0} / {1}</source> <comment>occurrences / files</comment> <translation type="unfinished">{0} / {1}</translation> </message> <message numerus="yes"> - <location filename="../UI/FindFileWidget.py" line="881" /> + <location filename="../UI/FindFileWidget.py" line="880" /> <source>%n occurrence(s)</source> <translation type="unfinished"> <numerusform /> </translation> </message> <message numerus="yes"> - <location filename="../UI/FindFileWidget.py" line="882" /> + <location filename="../UI/FindFileWidget.py" line="881" /> <source>%n file(s)</source> <translation type="unfinished"> <numerusform /> </translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1081" /> - <location filename="../UI/FindFileWidget.py" line="1056" /> - <location filename="../UI/FindFileWidget.py" line="1042" /> + <location filename="../UI/FindFileWidget.py" line="1080" /> + <location filename="../UI/FindFileWidget.py" line="1055" /> + <location filename="../UI/FindFileWidget.py" line="1041" /> <source>Replace in Files</source> <translation type="unfinished">Remplacer dans les fichiers</translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1043" /> + <location filename="../UI/FindFileWidget.py" line="1042" /> <source><p>Could not read the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1057" /> + <location filename="../UI/FindFileWidget.py" line="1056" /> <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 type="unfinished" /> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1082" /> + <location filename="../UI/FindFileWidget.py" line="1081" /> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1111" /> + <location filename="../UI/FindFileWidget.py" line="1110" /> <source>Open</source> <translation type="unfinished">Ouvrir</translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1113" /> + <location filename="../UI/FindFileWidget.py" line="1112" /> <source>Copy Path to Clipboard</source> <translation type="unfinished">Copier chemin dans le Presse-Papiers</translation> </message> <message> + <location filename="../UI/FindFileWidget.py" line="1116" /> + <source>Select All</source> + <translation type="unfinished">Tout sélectionner</translation> + </message> + <message> <location filename="../UI/FindFileWidget.py" line="1117" /> - <source>Select All</source> - <translation type="unfinished">Tout sélectionner</translation> - </message> - <message> - <location filename="../UI/FindFileWidget.py" line="1118" /> <source>Deselect All</source> <translation type="unfinished" /> </message> @@ -26966,37 +27076,37 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="91" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="94" /> <source>Additional Output</source> <translation>Sortie additionnelle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="110" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="113" /> <source>Process canceled.</source> <translation>Processus annulé.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="124" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="127" /> <source>Process finished successfully.</source> <translation>Processus terminé avec succès.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="126" /> - <source>Process crashed.</source> - <translation type="unfinished">Crash du processus.</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="129" /> + <source>Process crashed.</source> + <translation type="unfinished">Crash du processus.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="132" /> <source>Process finished with exit code {0}</source> <translation>Processus terminé avec le core de sortie {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="195" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="198" /> <source>Process Generation Error</source> <translation>Erreur du processus</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="196" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="199" /> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Impossible de lancer le processus {0}. Assurez-vous qu'il est bien dans le chemin de recherche.</translation> </message> @@ -35370,456 +35480,456 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="303" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="309" /> <source>Create project repository</source> <translation>Créer un répertoire projet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="304" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="310" /> <source>The project repository could not be created.</source> <translation>Le répertoire projet n'a pu être créé.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="338" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="344" /> <source>Creating Mercurial repository</source> <translation>Création en cour d'un répertoire Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="359" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="365" /> <source>Initial commit to Mercurial repository</source> <translation>Commit initial vers le dépot Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="405" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="411" /> <source>Cloning project from a Mercurial repository</source> <translation>Clonage du projet à partir d'un dépot Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="516" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="522" /> <source>Commit Changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="517" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="523" /> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation type="unfinished">Ce commit affecte des fichiers qui ont des modifications non enregistrées. Faut-il poursuivre le commit ?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="580" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="586" /> <source>Committing changes to Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="679" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="685" /> <source>Synchronizing with the Mercurial repository</source> <translation>Synchronisation en cours avec le dépot Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="719" /> <source>Adding files/directories to the Mercurial repository</source> <translation>Ajouter des fichiers/dossier au dépot Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="774" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="780" /> <source>Removing files/directories from the Mercurial repository</source> <translation>Suppression en cours des fichiers/dossiers à partir du dépot Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="829" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="835" /> <source>Renaming {0}</source> <translation type="unfinished">Renommage {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="964" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="970" /> <source>Tagging in the Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1011" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1000" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1017" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006" /> <source>Revert changes</source> <translation>Revenir avant les modifications</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1001" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1007" /> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1012" /> - <source>Do you really want to revert all changes of the project?</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1018" /> + <source>Do you really want to revert all changes of the project?</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1024" /> <source>Reverting changes</source> <translation>Revenir avant les modifications</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1064" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1070" /> <source>Merging</source> <translation>Fusion en cours</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1095" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1109" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101" /> <source>Re-Merge</source> <translation type="unfinished">Re-fusionner</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1102" /> <source>Do you really want to re-merge these files or directories?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1104" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1110" /> <source>Do you really want to re-merge the project?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1114" /> <source>Re-Merging</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1131" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1137" /> <source>Current branch tip</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1314" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1320" /> <source>Mercurial command</source> <translation>Commande Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1492" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1498" /> <source>Copying {0}</source> <translation>Copie en cours {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1758" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1746" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1764" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1752" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743" /> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1759" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1765" /> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>Le fichier <b>{0}</b> n'a pas pu être lu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2457" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2446" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2436" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1835" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2455" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844" /> <source>Apply changegroups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1838" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1847" /> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1884" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1893" /> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2027" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2036" /> <source>Marking as 'unresolved'</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2029" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038" /> <source>Marking as 'resolved'</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2051" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060" /> <source>Aborting uncommitted merge</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2084" /> <source>Creating branch in the Mercurial repository</source> <translation>Création en cours d'une branche sur le dépot Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086" /> - <source>Created new branch <{0}>.</source> - <translation>Nouvelle branche créée <{0}>.</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2095" /> + <source>Created new branch <{0}>.</source> + <translation>Nouvelle branche créée <{0}>.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2104" /> <source>Showing current branch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2184" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193" /> <source>Verifying the integrity of the Mercurial repository</source> <translation>Vérification en cours de l'intégrité du dépot Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2200" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209" /> <source>Showing the combined configuration settings</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2224" /> <source>Showing aliases for remote repositories</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2230" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239" /> <source>Recovering from interrupted transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254" /> <source>Identifying project directory</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2291" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2300" /> <source>Create .hgignore file</source> <translation>Créer un fichier .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2292" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301" /> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Le fichier <b>{0}</b>existe déjà. L'écraser ?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2395" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2369" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2351" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2404" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2378" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2360" /> <source>Create changegroup</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2353" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362" /> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2370" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2379" /> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2409" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2418" /> <source>Preview changegroup</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2438" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2411" /> - <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2447" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2420" /> + <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2456" /> <source>Shall the working directory be updated?</source> <translation>Faut-il mettre à jour le répertoire de travail ?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2479" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2488" /> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2501" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2510" /> <source>Mercurial Bisect ({0})</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2527" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2536" /> <source>Removing files from the Mercurial repository only</source> <translation>Supprimer les fichiers de dépot Mercurial uniquement</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2576" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2557" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2585" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2566" /> <source>Backing out changeset</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2558" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2567" /> <source>No revision given. Aborting...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2587" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2602" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2596" /> <source>Rollback last transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2588" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2597" /> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2657" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2666" /> <source>Import Patch</source> <translation>Importer un patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2707" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2716" /> <source>Export Patches</source> <translation>Exporter des patches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2749" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2758" /> <source>Change Phase</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2804" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813" /> <source>Copy Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2843" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2852" /> <source>Copy Changesets (Continue)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2853" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2862" /> <source>Copy Changesets (Stop)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2863" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2872" /> <source>Copy Changesets (Abort)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2887" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2896" /> <source>Create Unversioned Archive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2902" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2911" /> <source>Delete All Backups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2903" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2912" /> <source><p>Do you really want to delete all backup bundles stored in the backup area?<br/><b>{0}</b></p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2994" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2974" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2963" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2983" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2972" /> <source>Add Sub-repository</source> <translation>Ajouter un sous-dépot</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3033" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2964" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3042" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2973" /> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2975" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2984" /> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3051" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3060" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3004" /> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3050" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3032" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3018" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3059" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3027" /> <source>Remove Sub-repositories</source> <translation>Supprimer un sous-répertoire</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3019" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3028" /> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3296" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3138" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3147" /> <source>Mercurial Command Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3139" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3148" /> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3297" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3321" /> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3420" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3444" /> <source>Mercurial Bookmark</source> <translation>Signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3437" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3461" /> <source>Delete Bookmark</source> <translation>Supprimer le signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3438" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3462" /> <source>Select the bookmark to be deleted:</source> <translation>Selectionner le signet à supprimer :</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3449" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3473" /> <source>Delete Mercurial Bookmark</source> <translation>Supprimer le signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3476" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3500" /> <source>Rename Mercurial Bookmark</source> <translation>Renommer le signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3518" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3542" /> <source>Move Mercurial Bookmark</source> <translation>Déplacer le signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3600" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3624" /> <source>Pull Bookmark</source> <translation>Récuperer le signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3601" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3625" /> <source>Select the bookmark to be pulled:</source> <translation>Sélectionner le signet à récuperer:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3613" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3637" /> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>Récupérant le signet d'un dépôt Mercurial distant</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3641" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3665" /> <source>Push Bookmark</source> <translation>Envoyer signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3642" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3666" /> <source>Select the bookmark to be push:</source> <translation>Sélectionner le signet à envoyer:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3657" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3681" /> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>À envoyer le signet à un dépôt Mercurial distant</translation> </message> @@ -36665,42 +36775,42 @@ <context> <name>HgClient</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="98" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="100" /> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Impossible de lancer le processus {0}. Assurez-vous qu'il est bien dans le chemin de recherche.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="147" /> - <source>Did not receive the 'hello' message.</source> - <translation>N'a pas reçu le message 'hello'.</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="149" /> + <source>Did not receive the 'hello' message.</source> + <translation>N'a pas reçu le message 'hello'.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="151" /> <source>Received data on unexpected channel.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="154" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="156" /> <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="159" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="161" /> <source>'capabilities' message did not contain any capability.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="168" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="170" /> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="173" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="175" /> <source>'encoding' message did not contain any encoding.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="385" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="387" /> <source>For message see output dialog.</source> <translation type="unfinished" /> </message> @@ -37063,6 +37173,11 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="0" /> + <source>%v/%m</source> + <translation type="unfinished">%v/%m</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="0" /> <source>Errors</source> <translation>Erreurs</translation> </message> @@ -37106,6 +37221,11 @@ <source>Alt+P</source> <translation>Alt+P</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="211" /> + <source>Time remaining: {0}</source> + <translation type="unfinished" /> + </message> </context> <context> <name>HgDiffDialog</name> @@ -37285,6 +37405,69 @@ </message> </context> <context> + <name>HgFastexportConfigDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>fastexport Configuration</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the path of the file for the exported marks.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the path of the output file.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Revisions:</source> + <translation type="unfinished">Révisions :</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the path of the file containing already exported marks.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Author Map:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Import Marks:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Export Marks:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Output File:</source> + <translation type="unfinished">Fichier de sortie:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the revisions, tags or branches to be exported (separated by comma).</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the path of the author map file.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.py" line="42" /> + <source>Text Files (*.txt);;All Files (*)</source> + <translation type="unfinished">Fichiers texte (*.txt);;Tous les fichiers (*)</translation> + </message> + </context> + <context> <name>HgGpgSignDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="0" /> @@ -38096,7 +38279,7 @@ <translation type="unfinished">Affichage</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3049" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3063" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298" /> <source>Select Branches</source> <translation type="unfinished" /> @@ -38137,7 +38320,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2218" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2227" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> <source>Copy Changesets</source> <translation type="unfinished" /> @@ -38194,8 +38377,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2312" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2295" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2321" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2304" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="387" /> <source>Switch</source> <translation>Basculer de version</translation> @@ -38226,263 +38409,270 @@ <translation>Déplacer le signet vers la révision sélectionnée</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2430" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1622" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="415" /> - <source>Pull Changes</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="418" /> - <source>Pull changes from a remote repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="420" /> + <source>Pull Selected Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="419" /> + <source>Pull selected changes from a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="423" /> + <source>Pull All Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="427" /> + <source>Pull all changes from a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="430" /> <source>Pull Large Files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="422" /> - <source>Pull large files for selected revisions</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="428" /> - <source>Push Selected Changes</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="432" /> - <source>Push changes of the selected changeset and its ancestors to a remote repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="439" /> - <source>Push All Changes</source> + <source>Pull large files for selected revisions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="438" /> + <source>Push Selected Changes</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="442" /> - <source>Push all changes to a remote repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="448" /> - <source>Create Changegroup</source> + <source>Push changes of the selected changeset and its ancestors to a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="449" /> + <source>Push All Changes</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="452" /> + <source>Push all changes to a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="458" /> + <source>Create Changegroup</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="462" /> <source>Create a changegroup file containing the selected changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="455" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="465" /> <source><b>Create Changegroup</b> <p>This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2569" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="468" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2583" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="478" /> <source>Apply Changegroup</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="472" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="482" /> <source>Apply the currently viewed changegroup file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="489" /> <source>Sign Revisions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="483" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="493" /> <source>Add a signature for the selected revisions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="487" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="497" /> <source>Verify Signatures</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="491" /> - <source>Verify all signatures there may be for the selected revision</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2476" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498" /> - <source>Strip Changesets</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="501" /> + <source>Verify all signatures there may be for the selected revision</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="508" /> + <source>Strip Changesets</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="511" /> <source>Strip changesets from a repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="506" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="516" /> <source>Select All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="509" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="519" /> <source>Deselect All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="958" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="934" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="911" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="885" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="968" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="944" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="921" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="895" /> <source>Mercurial Error</source> <translation>Erreur Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1266" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1276" /> <source>{0} (large file)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1532" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1542" /> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1543" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1553" /> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1701" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1620" /> - <source>Pull Selected Changes</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2570" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2477" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2431" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2313" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2219" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2584" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2491" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2322" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2228" /> <source>The project should be reread. Do this now?</source> <translation>Le projet devrai être relu. Le faire maintenant ?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2296" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2305" /> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2341" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2350" /> <source>Define Bookmark</source> <translation>Définir un signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2342" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2351" /> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2371" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2380" /> <source>Move Bookmark</source> <translation>Déplacer un signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2372" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2381" /> <source>Select the bookmark to be moved to changeset '{0}':</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2444" /> + <source>Pull Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2727" /> <source>Find Commit</source> <translation>Chercher le commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2714" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728" /> <source>'{0}' was not found.</source> <translation>'{0}' n'a pas été trouvé.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2774" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2788" /> <source>Generating differences ...</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2775" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2789" /> <source>Differences</source> <translation>Différences</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2794" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2808" /> <source>No differences available. Get some more log entries.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2796" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2810" /> <source>No differences available.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2807" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2821" /> <source>Differences to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2823" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2837" /> <source>Diff to Parent {0}{1}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2846" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2860" /> <source>There is no difference.</source> <translation>Aucune différence.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2999" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2983" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2965" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3013" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2997" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2979" /> <source>Save Diff</source> <translation>Enregistrer Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2967" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2981" /> <source>Patch Files (*.diff)</source> <translation>Fichiers Patch (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2984" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2998" /> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Le fichier patch <b>{0}</b>existe déjà. Écraser ?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3000" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3014" /> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation><p>Le fichier patch <b>{0}</b> ne peut être enregistré.<br>Rasion : {1}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3031" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3045" /> <source>closed</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3032" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3046" /> <source>inactive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3041" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3055" /> <source>{0} ({1})</source> <translation type="unfinished">{0} ({1})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3050" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3064" /> <source>Select the branches to be shown (none for 'All'):</source> <translation type="unfinished" /> </message> @@ -38995,208 +39185,213 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="282" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="309" /> + <source>Other Functions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="335" /> <source>Extensions</source> <translation type="unfinished">Extensions</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="718" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="604" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="556" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="451" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="308" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="774" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="659" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="611" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="505" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="361" /> <source>Version Control</source> <translation>Contrôle de version</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="734" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="620" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="467" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="324" /> - <source>Commit changes to repository...</source> - <translation>Committer les modifications dans le dépot...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="742" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="628" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="475" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="332" /> - <source>Add to repository</source> - <translation>Ajouter au dépot</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="748" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="481" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="338" /> - <source>Remove from repository (and disk)</source> - <translation>Supprimer du référentiel (et du disque)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1012" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="999" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="487" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="344" /> - <source>Remove from repository only</source> - <translation>Supprimer du dépot uniquement</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="639" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="349" /> - <source>Copy</source> - <translation>Copier</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="641" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="351" /> - <source>Move</source> - <translation>Déplacer</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="646" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="356" /> - <source>Show log browser</source> - <translation>Afficher le navigateur de logs</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="755" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="653" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="494" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="363" /> - <source>Show status</source> - <translation>Afficher l'état (status)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="762" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="660" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="501" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="370" /> - <source>Show differences</source> - <translation>Montrer les différences</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="376" /> - <source>Show differences side-by-side</source> - <translation>Montrer les différences côte à côte</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="768" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="666" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="507" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="382" /> - <source>Show differences (extended)</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="388" /> - <source>Show differences side-by-side (extended)</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="394" /> - <source>Show annotated file</source> - <translation>Afficher les fichiers annotés</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="398" /> - <source>Show annotated file with skip list</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="402" /> - <source>Create skip list file</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="775" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="673" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="514" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="408" /> - <source>Revert changes</source> - <translation>Revenir avant les modifications</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="779" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="677" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="518" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="412" /> - <source>Conflicts resolved</source> - <translation type="unfinished">Conflits résolus</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="781" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="679" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="520" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="414" /> - <source>Conflicts unresolved</source> - <translation type="unfinished">Conflits non résolus</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="783" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="681" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="522" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="416" /> - <source>Re-Merge</source> - <translation>Re-fusionner</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="787" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="685" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="571" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="526" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="420" /> - <source>Select all local file entries</source> - <translation>Sélectionner tous les fichiers locaux</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="790" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="688" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="574" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="529" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="423" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="675" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="521" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="377" /> + <source>Commit changes to repository...</source> + <translation>Committer les modifications dans le dépot...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="799" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="684" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="530" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="386" /> + <source>Add to repository</source> + <translation>Ajouter au dépot</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="805" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="690" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="536" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="392" /> + <source>Remove from repository (and disk)</source> + <translation>Supprimer du référentiel (et du disque)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1069" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1056" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="542" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="398" /> + <source>Remove from repository only</source> + <translation>Supprimer du dépot uniquement</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="695" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="403" /> + <source>Copy</source> + <translation>Copier</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="697" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="405" /> + <source>Move</source> + <translation>Déplacer</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="702" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="410" /> + <source>Show log browser</source> + <translation>Afficher le navigateur de logs</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="812" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="709" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="549" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="417" /> + <source>Show status</source> + <translation>Afficher l'état (status)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="819" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="716" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="556" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="424" /> + <source>Show differences</source> + <translation>Montrer les différences</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="430" /> + <source>Show differences side-by-side</source> + <translation>Montrer les différences côte à côte</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="825" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="722" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="562" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="436" /> + <source>Show differences (extended)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="442" /> + <source>Show differences side-by-side (extended)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="448" /> + <source>Show annotated file</source> + <translation>Afficher les fichiers annotés</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="452" /> + <source>Show annotated file with skip list</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="456" /> + <source>Create skip list file</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="832" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="729" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="569" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="462" /> + <source>Revert changes</source> + <translation>Revenir avant les modifications</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="836" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="733" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="573" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="466" /> + <source>Conflicts resolved</source> + <translation type="unfinished">Conflits résolus</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="735" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="575" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="468" /> + <source>Conflicts unresolved</source> + <translation type="unfinished">Conflits non résolus</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="840" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="737" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="577" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="470" /> + <source>Re-Merge</source> + <translation>Re-fusionner</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="844" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="741" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="581" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="474" /> + <source>Select all local file entries</source> + <translation>Sélectionner tous les fichiers locaux</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="847" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="744" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="629" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="584" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="477" /> <source>Select all versioned file entries</source> <translation>Sélectionner tous les fichiers ayant une version</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="793" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="691" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="577" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="532" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="426" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="850" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="747" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="632" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="587" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="480" /> <source>Select all local directory entries</source> <translation>Sélectionner tous les répertoires locaux</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="797" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="695" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="581" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="536" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="430" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="854" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="751" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="591" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="484" /> <source>Select all versioned directory entries</source> <translation>Sélectionner tous les répertoires ayant une version</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="801" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="699" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="585" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="540" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="434" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="858" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="755" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="640" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="595" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="488" /> <source>Configure...</source> <translation>Configuration...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="916" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="973" /> <source>Create {0} file</source> <translation type="unfinished">Créer le fichier {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="917" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="974" /> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished"><p>Le fichier <b>{0}</b>existe déjà. L'écraser ?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1013" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1000" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1070" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1057" /> <source>Do you really want to remove these files from the repository?</source> <translation>Voulez-vous vraiment supprimer ces fichiers du dépot ?</translation> </message> @@ -39204,1513 +39399,1518 @@ <context> <name>HgProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="126" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="135" /> <source>New from repository</source> <translation>Nouveau à partir du référentiel</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="128" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="137" /> <source>&New from repository...</source> <translation>&Nouveau depuis un référentiel...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="135" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="144" /> <source>Create (clone) a new project from a Mercurial repository</source> <translation>Créer (clone) un nouveau projet à partir d'un dépot Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="138" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="147" /> <source><b>New from repository</b><p>This creates (clones) a new local project from a Mercurial repository.</p></source> <translation><b>Nouvea à partir d'un dépot</b><p>Cela créé (clone) un nouveau projet local à partir d'un dépot Mercurial.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="150" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="148" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="159" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="157" /> <source>Show incoming log</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="156" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="165" /> <source>Show the log of incoming changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="158" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="167" /> <source><b>Show incoming log</b><p>This shows the log of changes coming into the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="170" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="168" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="179" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="177" /> <source>Pull changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="176" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="185" /> <source>Pull changes from a remote repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="178" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="187" /> <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="188" /> - <source>Update from repository</source> - <translation>Mise à jour à partir du dépot</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="190" /> - <source>&Update from repository</source> - <translation>Mettre à jo&ur à partir du dépot</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="197" /> + <source>Update from repository</source> + <translation>Mise à jour à partir du dépot</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="199" /> + <source>&Update from repository</source> + <translation>Mettre à jo&ur à partir du dépot</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="206" /> <source>Update the local project from the Mercurial repository</source> <translation>Mettre à jour le projet local à partir du dépot Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="200" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="209" /> <source><b>Update from repository</b><p>This updates the local project from the Mercurial repository.</p></source> <translation><b>Mettre à jour à partir d'un dépot</b><p>Cela mets à jour le projet local à partir d'un dépot Mercurial.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="210" /> - <source>Commit changes to repository</source> - <translation>"Commiter" les modifications au référentiel</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="212" /> - <source>&Commit changes to repository...</source> - <translation>&Appliquer les changements dans le référentiel...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="219" /> + <source>Commit changes to repository</source> + <translation>"Commiter" les modifications au référentiel</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="221" /> + <source>&Commit changes to repository...</source> + <translation>&Appliquer les changements dans le référentiel...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="228" /> <source>Commit changes to the local project to the Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="231" /> <source><b>Commit changes to repository</b><p>This commits changes to the local project to the Mercurial repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="234" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="232" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="243" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="241" /> <source>Show outgoing log</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="240" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="249" /> <source>Show the log of outgoing changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="242" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251" /> <source><b>Show outgoing log</b><p>This shows the log of changes outgoing out of the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="254" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="252" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261" /> <source>Push changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="260" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="269" /> <source>Push changes to a remote repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="262" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271" /> <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="274" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="272" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281" /> <source>Push changes (force)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="290" /> <source>Push changes to a remote repository with force option</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="284" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293" /> <source><b>Push changes (force)</b><p>This pushes changes from the local repository to a remote repository using the 'force' option.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="294" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="303" /> <source>Export from repository</source> <translation>Exporter du référentiel</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="296" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="305" /> <source>&Export from repository...</source> <translation>&Exporter du référentiel...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="302" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="311" /> <source>Export a project from the repository</source> <translation>Exporte un projet d'un référentiel VCS</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="313" /> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation><b>Exporter du référentiel</b><p>Exporte un projet d'un référentiel VCS.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="313" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="324" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322" /> <source>Show log browser</source> <translation>Afficher le navigateur de logs</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="331" /> <source>Show a dialog to browse the log of the local project</source> <translation>Affiche une fenêtre permettant de parcourir les logs du projet local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="334" /> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation><b>Navigateur de logs</b><p>Affiche une fenêtre permettant de parcourir les messages logs du projet local. La fenêtre n'affiche qu'un nombre limité d'entrées, mais un bouton permet d'afficher les logs plus anciens.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="336" /> - <source>Show differences</source> - <translation>Montrer les différences</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="338" /> - <source>Show &difference</source> - <translation>Afficher les &différences</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="345" /> + <source>Show differences</source> + <translation>Montrer les différences</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347" /> + <source>Show &difference</source> + <translation>Afficher les &différences</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="354" /> <source>Show the difference of the local project to the repository</source> <translation>Affiche les différences entre le projet local et le référentiel</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="357" /> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished"><b>Montrer les différences</b><p>Cela affiche les différences entre le projet local et le dépot.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="360" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="358" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="369" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="367" /> <source>Show differences (extended)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="367" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376" /> <source>Show the difference of revisions of the project to the repository</source> <translation>Affiche les différences entre le référentiel et les différentes révisions du projet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="370" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379" /> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="380" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389" /> <source>Show status</source> <translation>Afficher l'état (status)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="391" /> <source>Show &status...</source> <translation>Montrer les &statuts...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="397" /> <source>Show the status of the local project</source> <translation>Affiche l'état du projet local par rapport au référentiel VCS</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390" /> - <source><b>Show status</b><p>This shows the status of the local project.</p></source> - <translation><b>Afficher l'état VCS</b><p>Affiche l'état du projet local par rapport au référentiel VCS.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="399" /> - <source>Show Summary</source> - <translation>Montrer le bilan</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="401" /> - <source>Show summary...</source> - <translation>Montrer le bilan...</translation> + <source><b>Show status</b><p>This shows the status of the local project.</p></source> + <translation><b>Afficher l'état VCS</b><p>Affiche l'état du projet local par rapport au référentiel VCS.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408" /> + <source>Show Summary</source> + <translation>Montrer le bilan</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="410" /> + <source>Show summary...</source> + <translation>Montrer le bilan...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="417" /> <source>Show summary information of the working directory status</source> <translation type="unfinished">Afficher le bilan du statut du répertoire de travail</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="411" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420" /> <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="430" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="430" /> <source>Show heads</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="432" /> <source>Show the heads of the repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="425" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="434" /> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="434" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="443" /> <source>Show parents</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="441" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450" /> <source>Show the parents of the repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="443" /> - <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="452" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="452" /> + <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461" /> <source>Show tip</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="463" /> <source>Show the tip of the repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="456" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="465" /> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462" /> - <source>Revert changes</source> - <translation>Revenir avant les modifications</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464" /> - <source>Re&vert changes</source> - <translation>&Recharger le projet</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471" /> + <source>Revert changes</source> + <translation>Revenir avant les modifications</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="473" /> + <source>Re&vert changes</source> + <translation>&Recharger le projet</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="480" /> <source>Revert all changes made to the local project</source> <translation>Recharger le projet et écraser toutes les modifications locales</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483" /> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation><b>Recharger le projet</b><p>Recharge le projet et écrase toutes les modifications effectuées localement.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2110" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2129" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492" /> <source>Merge</source> <translation>Fusionner</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="485" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494" /> <source>Mer&ge changes...</source> <translation>&Fusionner les modifications...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501" /> <source>Merge changes of a revision into the local project</source> <translation>Fusionne les modifications d'une révision dans le projet local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="495" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="504" /> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation><b>Fusion</b><p>Cela fusionne les modifications d'une révision dans le projet local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="506" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="515" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514" /> <source>Commit Merge</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521" /> <source>Commit all the merged changes.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="523" /> <source><b>Commit a merge</b><p>This commits a merge working directory</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="523" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="533" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="532" /> <source>Abort Merge</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="531" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540" /> <source>Abort an uncommitted merge and lose all changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="543" /> <source><b>Abort uncommitted merge</b><p>This aborts an uncommitted merge causing all changes to be lost.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="546" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="544" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="553" /> <source>Re-Merge</source> <translation>Re-fusionner</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="553" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="562" /> <source>Re-Merge all conflicting, unresolved files of the project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="556" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="565" /> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="575" /> <source>Show conflicts</source> <translation>Montrer les conflits</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="576" /> <source>Show conflicts...</source> <translation>Montrer les conflits...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="583" /> <source>Show a dialog listing all files with conflicts</source> <translation>Affiche une fenêtre listant tous les fichiers en conflit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586" /> <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596" /> <source>Conflicts resolved</source> <translation>Conflits résolus</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="597" /> <source>Con&flicts resolved</source> <translation>Con&flits résolus</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604" /> <source>Mark all conflicts of the local project as resolved</source> <translation>Marquer tous les conflits du projet local comme résolus</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="607" /> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation><b>Conflits résolus</b><p>Ceci marque tous les conflits du projet local comme résolus.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617" /> <source>Conflicts unresolved</source> <translation>Conflits non résolus</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625" /> <source>Mark all conflicts of the local project as unresolved</source> <translation>Marquer tous les conflits du projet local comme non résolus</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628" /> <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> <translation><b>Conflits non résolus</b><p>Ceci marque tous les conflits du projet local comme non résolus.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638" /> <source>Tag in repository</source> <translation>Etiqueter au niveau du référentiel (tag)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640" /> <source>&Tag in repository...</source> <translation>&Etiqueter dans le référentiel...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="637" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646" /> <source>Tag the local project in the repository</source> <translation>Etiquette le projet local dans le référentiel</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="639" /> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation><b>Etiqueter dans le référentiel</b><p>Etiquette le projet local dans le référentiel (opération "tag").</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648" /> - <source>List tags</source> - <translation>Lister les étiquettes</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="649" /> - <source>List tags...</source> - <translation>Lister les étiquettes...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655" /> - <source>List tags of the project</source> - <translation>Liste les étiquettes du projet</translation> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation><b>Etiqueter dans le référentiel</b><p>Etiquette le projet local dans le référentiel (opération "tag").</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657" /> - <source><b>List tags</b><p>This lists the tags of the project.</p></source> - <translation><b>Liste des étiquettes</b><p>Liste les étiquettes du projet.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663" /> - <source>List branches</source> - <translation>Lister les branches</translation> + <source>List tags</source> + <translation>Lister les étiquettes</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="658" /> + <source>List tags...</source> + <translation>Lister les étiquettes...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="664" /> - <source>List branches...</source> - <translation>Lister les branches...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670" /> - <source>List branches of the project</source> - <translation>Liste les branches du projet</translation> + <source>List tags of the project</source> + <translation>Liste les étiquettes du projet</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666" /> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <translation><b>Liste des étiquettes</b><p>Liste les étiquettes du projet.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672" /> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation><b>Liste des branches</b><p>Effectue la liste de toutes les branches de développement du projet.</p></translation> + <source>List branches</source> + <translation>Lister les branches</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673" /> + <source>List branches...</source> + <translation>Lister les branches...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="679" /> + <source>List branches of the project</source> + <translation>Liste les branches du projet</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681" /> - <source>Create branch</source> - <translation>Créer une branche</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="683" /> - <source>Create &branch...</source> - <translation>Créer une &branche...</translation> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation><b>Liste des branches</b><p>Effectue la liste de toutes les branches de développement du projet.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="690" /> + <source>Create branch</source> + <translation>Créer une branche</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692" /> + <source>Create &branch...</source> + <translation>Créer une &branche...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699" /> <source>Create a new branch for the local project in the repository</source> <translation>Créer une nouvelle branche pour le projet local dans le dépot</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="693" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="702" /> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703" /> - <source>Push new branch</source> - <translation type="unfinished" /> - </message> - <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712" /> + <source>Push new branch</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721" /> <source>Push the current branch of the local project as a new named branch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="717" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726" /> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="738" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736" /> <source>Close branch</source> <translation>Fermer la branche</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="745" /> <source>Close the current branch of the local project</source> <translation>Feme la branche courante du projet local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748" /> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation><b>Fermer la branche</b><p>Ceci feme la branche courante du projet local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="758" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757" /> <source>Show current branch</source> <translation>Montrer la branche courante</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="756" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765" /> <source>Show the current branch of the project</source> <translation>Montrer la branche courante du projet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="759" /> - <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> - <translation><b>Montrer la branche courante</b><p>Ceci montre la branche courante du projet.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768" /> - <source>Switch</source> - <translation>Basculer de version</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770" /> - <source>S&witch...</source> - <translation>&Basculer de version...</translation> + <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> + <translation><b>Montrer la branche courante</b><p>Ceci montre la branche courante du projet.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777" /> + <source>Switch</source> + <translation>Basculer de version</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="779" /> + <source>S&witch...</source> + <translation>&Basculer de version...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786" /> <source>Switch the working directory to another revision</source> <translation type="unfinished">Basculer le répertoire de travail sur une autre version</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="780" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="789" /> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799" /> <source>Cleanup</source> <translation>Nettoyer</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799" /> <source>Cleanu&p</source> <translation>&Nettoyer</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="792" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801" /> <source>Cleanup the local project</source> <translation>Nettoyer le projet local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794" /> - <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> - <translation><b>Nettoyer</b><p>Permet de nettoyer le projet local.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="803" /> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation><b>Nettoyer</b><p>Permet de nettoyer le projet local.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="812" /> <source>Execute command</source> <translation>Exécuter une commande</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813" /> <source>E&xecute command...</source> <translation>E&xécuter une commande...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="811" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="820" /> <source>Execute an arbitrary Mercurial command</source> <translation>Executer une commande Mercurial arbitraire</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="814" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="823" /> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation><b>Exécuter une commande</b><p>Ceci ouvre une fenêtre pour saisir une commande arbitraire Mercurial.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="824" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833" /> <source>Configure</source> <translation>Configuration</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="834" /> <source>Configure...</source> <translation>Configuration...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="841" /> <source>Show the configuration dialog with the Mercurial page selected</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="835" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="844" /> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854" /> <source>Edit user configuration</source> <translation>Éditer la configuration utilisateur</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855" /> <source>Edit user configuration...</source> <translation>Éditer la configuration utilisateur...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="862" /> <source>Show an editor to edit the user configuration file</source> <translation>Affiche un éditeur pour modifier le fichier de configuration utilisateur</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="856" /> - <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> - <translation><b>Éditer la configuration utilisateur</b><p>Affiche un éditeur pour modifier le fichier de configuration utilisateur.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865" /> + <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> + <translation><b>Éditer la configuration utilisateur</b><p>Affiche un éditeur pour modifier le fichier de configuration utilisateur.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874" /> <source>Edit repository configuration</source> <translation>Éditer la configuration du dépot</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875" /> <source>Edit repository configuration...</source> <translation>Éditer la configuration du dépot...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="873" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882" /> <source>Show an editor to edit the repository configuration file</source> <translation>Affiche un éditeur pour modifier le fichier de configuration du dépot</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="876" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885" /> <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation><b>Éditer la configuration du dépot</b><p>Affiche un éditeur pour modifier le fichier de configuration du dépot.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895" /> <source>Show combined configuration settings</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896" /> <source>Show combined configuration settings...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="894" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903" /> <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909" /> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919" /> <source>Show paths</source> <translation>Montrer les chemins</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="911" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="920" /> <source>Show paths...</source> <translation>Montrer les chemins...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="918" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="927" /> <source>Show the aliases for remote repositories</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="921" /> - <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930" /> - <source>Verify repository</source> - <translation>Vérifier le dépot</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="931" /> - <source>Verify repository...</source> - <translation>Vérifier le dépot...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937" /> - <source>Verify the integrity of the repository</source> - <translation>Vérifier l'intégrité du dépot</translation> + <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> + <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="939" /> - <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> - <translation><b>Vérifier le dépot</b><p>Ceci vérifie l'intégrité du dépot.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="948" /> - <source>Recover</source> - <translation type="unfinished" /> + <source>Verify repository</source> + <translation>Vérifier le dépot</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="940" /> + <source>Verify repository...</source> + <translation>Vérifier le dépot...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="946" /> + <source>Verify the integrity of the repository</source> + <translation>Vérifier l'intégrité du dépot</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="948" /> + <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> + <translation><b>Vérifier le dépot</b><p>Ceci vérifie l'intégrité du dépot.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="957" /> + <source>Recover</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="957" /> <source>Recover...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="951" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960" /> <source>Recover from an interrupted transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="954" /> - <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="963" /> - <source>Identify</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964" /> - <source>Identify...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="970" /> - <source>Identify the project directory</source> + <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="972" /> + <source>Identify</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973" /> + <source>Identify...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979" /> + <source>Identify the project directory</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="981" /> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="981" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="990" /> <source>Create .hgignore</source> <translation>Créer le .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="989" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="998" /> <source>Create a .hgignore file with default values</source> <translation>Créer un fichier .hgignore avec les valeurs par défaut</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="992" /> - <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> - <translation><b>Créer le .hgignore</b><p>Créer un fichier .hgignore avec les valeurs par défaut.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001" /> - <source>Create changegroup</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1003" /> - <source>Create changegroup...</source> - <translation type="unfinished" /> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> + <translation><b>Créer le .hgignore</b><p>Créer un fichier .hgignore avec les valeurs par défaut.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010" /> + <source>Create changegroup</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1012" /> + <source>Create changegroup...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1019" /> <source>Create changegroup file collecting changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1013" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1022" /> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1023" /> - <source>Preview changegroup</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1025" /> - <source>Preview changegroup...</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032" /> + <source>Preview changegroup</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1034" /> + <source>Preview changegroup...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041" /> <source>Preview a changegroup file containing a collection of changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044" /> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2244" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1045" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2263" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054" /> <source>Apply changegroups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1047" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056" /> <source>Apply changegroups...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063" /> <source>Apply one or several changegroup files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066" /> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1067" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076" /> <source>Mark as "good"</source> <translation>Marquer comme "bon"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1077" /> <source>Mark as "good"...</source> <translation>Marquer comme "bon"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1075" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1084" /> <source>Mark a selectable changeset as good</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1078" /> - <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1087" /> - <source>Mark as "bad"</source> - <translation>Marquer comme "mauvais"</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088" /> - <source>Mark as "bad"...</source> - <translation>Marquer comme "mauvais"...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1094" /> - <source>Mark a selectable changeset as bad</source> + <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1096" /> - <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> + <source>Mark as "bad"</source> + <translation>Marquer comme "mauvais"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1097" /> + <source>Mark as "bad"...</source> + <translation>Marquer comme "mauvais"...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103" /> + <source>Mark a selectable changeset as bad</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105" /> + <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1114" /> <source>Skip</source> <translation>Passer</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1114" /> <source>Skip...</source> <translation>Passer...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1107" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116" /> <source>Skip a selectable changeset</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1109" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118" /> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1115" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1115" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124" /> <source>Reset</source> <translation>Réinitialiser</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1117" /> - <source>Reset the bisect search data</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119" /> - <source><b>Reset</b><p>This resets the bisect search data.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1126" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1125" /> + <source>Reset the bisect search data</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128" /> + <source><b>Reset</b><p>This resets the bisect search data.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1135" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134" /> <source>Back out changeset</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1142" /> <source>Back out changes of an earlier changeset</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1145" /> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1145" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1155" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154" /> <source>Rollback last transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1152" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161" /> <source>Rollback the last transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1163" /> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1176" /> - <source>Serve project repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1177" /> - <source>Serve project repository...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183" /> - <source>Serve the project repository</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185" /> + <source>Serve project repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1186" /> + <source>Serve project repository...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1192" /> + <source>Serve the project repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1194" /> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2301" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1194" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1203" /> <source>Import Patch</source> <translation>Importer un patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1196" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1205" /> <source>Import Patch...</source> <translation>Importer un patch...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1202" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211" /> <source>Import a patch from a patch file</source> <translation>Importer un patch à partir d'un fichier patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1204" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1213" /> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation><b>Importer un patch</b><p>Ceci importe un patch à partir d'un fichier patch dans le projet.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1214" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1223" /> <source>Export Patches</source> <translation>Exporter les patchs</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1225" /> <source>Export Patches...</source> <translation>Exporter les patchs...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1222" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1231" /> <source>Export revisions to patch files</source> <translation>Exporter les révisions vers les fichiers patchs</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1224" /> - <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> - <translation><b>Exporter les patchs</b><p>Ceci exporte les révisions vers les fichiers patchs.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233" /> - <source>Change Phase</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234" /> - <source>Change Phase...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1240" /> - <source>Change the phase of revisions</source> - <translation type="unfinished" /> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> + <translation><b>Exporter les patchs</b><p>Ceci exporte les révisions vers les fichiers patchs.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1242" /> + <source>Change Phase</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1243" /> + <source>Change Phase...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1249" /> + <source>Change the phase of revisions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251" /> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2343" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1804" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1253" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2362" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1822" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1262" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1260" /> <source>Copy Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1259" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1268" /> <source>Copies changesets from another branch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1261" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270" /> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1273" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1272" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1282" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1281" /> <source>Continue Copying Session</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1280" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1289" /> <source>Continue the last copying session after conflicts were resolved</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1283" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1292" /> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1294" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1293" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1303" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1302" /> <source>Stop Copying Session</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1310" /> <source>Stop the interrupted copying session</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1304" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1313" /> <source><b>Stop Copying Session</b><p>This stops the interrupted copying session.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1314" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1313" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1323" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1322" /> <source>Abort Copying Session</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1321" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330" /> <source>Abort the interrupted copying session and rollback</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1324" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1333" /> <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1334" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1343" /> <source>Add</source> <translation>Ajouter</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1336" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1345" /> <source>Add...</source> <translation>Ajouter...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1342" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1351" /> <source>Add a sub-repository</source> <translation>Ajouter un sous-répertoire</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1344" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1353" /> <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation><b>Ajouter...</b><p>Ajouter un sous-répertoire au projet.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1350" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1359" /> <source>Remove</source> <translation>Supprimer</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1352" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1361" /> <source>Remove...</source> <translation>Supprimer...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1358" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367" /> <source>Remove sub-repositories</source> <translation>Supprimer les sous-répertoires</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1360" /> - <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> - <translation><b>Supprimer...</b><p>Supprimer les sous-répertoires du projet.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1369" /> - <source>Create unversioned archive</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1371" /> - <source>Create unversioned archive...</source> - <translation type="unfinished" /> + <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> + <translation><b>Supprimer...</b><p>Supprimer les sous-répertoires du projet.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1378" /> + <source>Create unversioned archive</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1380" /> + <source>Create unversioned archive...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1387" /> <source>Create an unversioned archive from the repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1381" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1390" /> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1391" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1400" /> <source>List bookmarks</source> <translation>Lister les signets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1393" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1402" /> <source>List bookmarks...</source> <translation>Lister les signets ...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1399" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1408" /> <source>List bookmarks of the project</source> <translation>Lister les signets du projet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1401" /> - <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> - <translation><b>Lister les signets</b><p>Ceci liste tous les signets du projet.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1410" /> - <source>Define bookmark</source> - <translation>Définir signet</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1412" /> - <source>Define bookmark...</source> - <translation>Définir signet ...</translation> + <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> + <translation><b>Lister les signets</b><p>Ceci liste tous les signets du projet.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1419" /> + <source>Define bookmark</source> + <translation>Définir signet</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1421" /> + <source>Define bookmark...</source> + <translation>Définir signet ...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1428" /> <source>Define a bookmark for the project</source> <translation>Définir un signet pour le projet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1422" /> - <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> - <translation><b>Définir un signet</b><p>Ceci défini un signet pour le projet.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1431" /> - <source>Delete bookmark</source> - <translation>Supprimer signet</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1433" /> - <source>Delete bookmark...</source> - <translation>Supprimer signet ...</translation> + <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> + <translation><b>Définir un signet</b><p>Ceci défini un signet pour le projet.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1440" /> + <source>Delete bookmark</source> + <translation>Supprimer signet</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1442" /> + <source>Delete bookmark...</source> + <translation>Supprimer signet ...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1449" /> <source>Delete a bookmark of the project</source> <translation>Supprimer un signet du projet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1443" /> - <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> - <translation><b>Supprimer signet</b><p>Ceci supprime un signet du projet.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1452" /> - <source>Rename bookmark</source> - <translation>Renommer signet</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1454" /> - <source>Rename bookmark...</source> - <translation>Renommer signet ...</translation> + <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> + <translation><b>Supprimer signet</b><p>Ceci supprime un signet du projet.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1461" /> + <source>Rename bookmark</source> + <translation>Renommer signet</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1463" /> + <source>Rename bookmark...</source> + <translation>Renommer signet ...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1470" /> <source>Rename a bookmark of the project</source> <translation>Renommer un signet du projet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1464" /> - <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> - <translation><b>Renommer signet</b><p>Ceci renome un signet du projet.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1473" /> + <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> + <translation><b>Renommer signet</b><p>Ceci renome un signet du projet.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1482" /> <source>Move bookmark</source> <translation>Déplacer signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1475" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1484" /> <source>Move bookmark...</source> <translation>Déplacer signet ...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1481" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1490" /> <source>Move a bookmark of the project</source> <translation>Déplacer un signet du projet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1483" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1492" /> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation><b>Déplacer signet</b><p>Ceci déplace un signet du projet dans un autre ensemble.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1495" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1493" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1504" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1502" /> <source>Show incoming bookmarks</source> <translation>Montrer nouveaux signets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1502" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1511" /> <source>Show a list of incoming bookmarks</source> <translation>Montrer la liste des nouveaux signets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1505" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1514" /> <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> <translation><b>Montrer les nouveaux signets</b><p>Cedi montre la liste des nouveaux signets disponibles dans le dépôt distant. </p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1517" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1515" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1526" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1524" /> <source>Pull bookmark</source> <translation>Télécharger signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1524" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1533" /> <source>Pull a bookmark from a remote repository</source> <translation>Télecharger un signet d'un répertoire distant</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1527" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1536" /> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation><b>Télécharger signet</b><p>Ceci télécharge un signe d'un répertoire distant dans le répertoire local. </p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1539" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1537" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1548" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1546" /> <source>Pull current bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1546" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1555" /> <source>Pull the current bookmark from a remote repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1549" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1558" /> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1560" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1558" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1569" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1567" /> <source>Show outgoing bookmarks</source> <translation>Montrer signets sortants</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1567" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1576" /> <source>Show a list of outgoing bookmarks</source> <translation>Montrer la list des signets sortants</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1570" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1579" /> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation><b>Montrer les signets sortants</b><p>Ceci montre la liste des signets disponibles dans le répertoire local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1582" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1580" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1591" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1589" /> <source>Push bookmark</source> <translation>Envoyer signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1589" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1598" /> <source>Push a bookmark to a remote repository</source> <translation>Envoyer un signet dans un répertoire distant</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1592" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1601" /> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation><b>Envoyer signet</b><p>Ceci envoie un signet depuis un répertoire local dans un répertoire distant. </p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1604" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1602" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1613" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1611" /> <source>Push current bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1611" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1620" /> <source>Push the current bookmark to a remote repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1614" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1623" /> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1626" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1624" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1635" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1633" /> <source>Push all bookmarks</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1633" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1642" /> <source>Push all bookmarks to a remote repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1636" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1645" /> <source><b>Push all bookmarks</b><p>This pushes all bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1647" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1645" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1656" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1654" /> <source>Delete all backups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1654" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1663" /> <source>Delete all backup bundles stored in the backup area</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1657" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1666" /> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1699" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1708" /> <source>Administration</source> <translation>Administration</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1724" /> - <source>Specials</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1733" /> + <source>Specials</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1742" /> <source>Changegroup Management</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1740" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1749" /> <source>Patch Management</source> <translation>Gestion de patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1746" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1755" /> <source>Bisect</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1754" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1763" /> <source>Tags</source> <translation>Étiquettes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1761" /> - <source>Branches</source> - <translation>Branches</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1770" /> + <source>Branches</source> + <translation>Branches</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1779" /> <source>Bookmarks</source> <translation>Signets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1791" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1800" /> + <source>Other Functions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1809" /> <source>Extensions</source> <translation type="unfinished">Extensions</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1813" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1831" /> <source>Sub-Repository</source> <translation>Sous-répertoire</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1818" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1836" /> <source>Merge Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1903" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1901" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1922" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1920" /> <source>Mercurial</source> <translation>Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2054" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2073" /> <source>Pull</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2391" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2375" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2360" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2344" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2323" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2302" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2245" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2055" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2410" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2394" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2379" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2363" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2342" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2321" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2264" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2074" /> <source>The project should be reread. Do this now?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2322" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2341" /> <source>Revert Changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2359" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2378" /> <source>Copy Changesets (Continue)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2374" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2393" /> <source>Copy Changesets (Stop)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2390" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2409" /> <source>Copy Changesets (Abort)</source> <translation type="unfinished" /> </message> @@ -40718,7 +40918,7 @@ <context> <name>HgPurgeListDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/HgPurgeListDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/HgPurgeListDialog.ui" line="0" /> <source>Purge List</source> <translation type="unfinished" /> </message> @@ -41890,87 +42090,87 @@ <context> <name>HgShelveBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Mercurial Shelve Browser</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Name</source> <translation>Nom</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Age</source> <translation>Age</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Message</source> <translation>Message</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Statistics</source> <translation>Statistique</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>File</source> <translation>Fichier</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Changes</source> <translation>Modifications</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Lines added</source> <translation>Lignes ajoutées</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Lines deleted</source> <translation>Lignes supprimées</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Errors</source> <translation>Erreurs</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source><b>Mercurial shelve errors</b><p>This shows possible error messages of the hg shelve command.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="58" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="58" /> <source>&Refresh</source> <translation>&Rafraichir</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="60" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="60" /> <source>Press to refresh the list of shelves</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="69" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="69" /> <source>Restore selected shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="72" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="72" /> <source>Delete selected shelves</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="75" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="75" /> <source>Delete all shelves</source> <translation type="unfinished" /> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="290" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="290" /> <source>%n file(s) changed</source> <translation> <numerusform>%n fichier modifié</numerusform> @@ -41978,7 +42178,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="292" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="292" /> <source>%n line(s) inserted</source> <translation> <numerusform>%n ligne insérée</numerusform> @@ -41986,7 +42186,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="295" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="295" /> <source>%n line(s) deleted</source> <translation> <numerusform>%n ligne supprimée</numerusform> @@ -41997,57 +42197,57 @@ <context> <name>HgShelveDataDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Name:</source> <translation>Nom :</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Enter a name for the shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Date, Time:</source> <translation>Date, Heure :</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Enter the commit date and time for the shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>yyyy-MM-dd HH:mm</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Message:</source> <translation>Message :</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Enter a message for the shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Mark new/missing files as added/removed</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Select to shelve, but keep the changes in the working directory</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Shelve, but keep changes</source> <translation type="unfinished" /> </message> @@ -42055,7 +42255,7 @@ <context> <name>HgShelvesSelectionDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelvesSelectionDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelvesSelectionDialog.ui" line="0" /> <source>Mercurial Shelve Selection</source> <translation type="unfinished" /> </message> @@ -42359,124 +42559,60 @@ <context> <name>HgStripDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Strip Changesets</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> <source>&Revision</source> - <translation>&Révision</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">&Révision</translation> + </message> + <message> <source>Select to specify a revision by number</source> - <translation>Sélectionner pour spécifier une révision par son numéro</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Sélectionner pour spécifier une révision par son numéro</translation> + </message> + <message> <source>Number</source> - <translation>Numéro</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Numéro</translation> + </message> + <message> <source>Enter a revision number</source> - <translation>Entrer un numéro de révision</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to specify a revision by changeset id</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Id:</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enter a changeset id</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Entrer un numéro de révision</translation> + </message> + <message> <source>Select to specify a revision by a tag</source> - <translation>Cocher pour spécifier une révision par une étiquette</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Cocher pour spécifier une révision par une étiquette</translation> + </message> + <message> <source>Tag:</source> - <translation>Étiquette :</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Étiquette :</translation> + </message> + <message> <source>Enter a tag name</source> - <translation>Entrer un nom d'étiquette</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Entrer un nom d'étiquette</translation> + </message> + <message> <source>Select to specify a revision by a branch</source> - <translation>Cocher pour spécifier une révision par une branche</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Cocher pour spécifier une révision par une branche</translation> + </message> + <message> <source>Branch:</source> - <translation>Branche :</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Branche :</translation> + </message> + <message> <source>Enter a branch name</source> - <translation>Entrer un nom de branche</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Entrer un nom de branche</translation> + </message> + <message> <source>Expression:</source> - <translation type="unfinished">Expression :</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enter a revision set expression</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Expression :</translation> + </message> + <message> <source>Bookmark:</source> - <translation>Signet :</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Signet :</translation> + </message> + <message> <source>Enter a bookmark name</source> - <translation>Entrer un nom de signet</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to enforce removal of changesets</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enforce Operation</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to not create backup bundles</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>No Backup</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to keep the current working directory state</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Entrer un nom de signet</translation> + </message> + <message> <source>Keep Working Directory</source> - <translation>Garder le répertoire de travail</translation> + <translation type="vanished">Garder le répertoire de travail</translation> </message> </context> <context> @@ -42985,29 +43121,124 @@ </message> </context> <context> + <name>HgUncommitDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Undo Local Commit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Commit Message</source> + <translation type="unfinished">Message de commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Enter the log message.</source> + <translation type="unfinished">Entrer un message log.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source><b>Log Message</b> +<p>Enter the log message for the uncommit action.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Recent commit messages</source> + <translation type="unfinished">Messages de commit récents</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Select a recent commit message to use</source> + <translation type="unfinished">Sélectionner un message de commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Select to allow an empty commit after undoing it.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Allow empty commit after undoing commit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Select to allow undoing the commit with outstanding changes.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Allow undoing commit with outstanding changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Author</source> + <translation type="unfinished">Auteur</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Enter author name to override the configured user:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Enter an author name in order to override the configured one</source> + <translation type="unfinished">Entrer le nom de l'auteur pour écraser celui configuré</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Select to give date and time information</source> + <translation type="unfinished">Cocher pour définir la date et heure</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Date and Time</source> + <translation type="unfinished">Date et heure</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Date/Time:</source> + <translation type="unfinished">Date/heure :</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Enter the date and time to be used</source> + <translation type="unfinished">Entrer la date et heure à utiliser</translation> + </message> + <message> + <source><b>Log Message</b> +<p>Enter the log message for the commit action.</p></source> + <translation type="vanished"><b> Message Log</b> +<p>Entrer un message log pour la mise à jour 'commit'.</p></translation> + </message> + </context> + <context> <name>HgUnshelveDataDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Mercurial Unshelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Name:</source> <translation>Nom :</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Enter the name of the shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Select to keep the shelved change</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Keep shelved change</source> <translation type="unfinished" /> </message> @@ -43077,22 +43308,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> - <translation>GPG</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the histedit extension</source> + <source>Rebase</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Histedit</source> + <source>Select to activate the queues extension</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> + <source>Queues</source> <translation type="unfinished" /> </message> <message> @@ -43108,52 +43339,42 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the Purge 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>Purge</source> + <source>Histedit</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the queues extension</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Queues</source> + <source>Select to activate the GPG 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 type="unfinished" /> + <source>GPG</source> + <translation>GPG</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Rebase</source> + <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 shelve extension</source> + <source>Fastexport</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Shelve</source> + <source>Select to activate the uncommit extension</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the strip extension</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Strip</source> + <source>Uncommit</source> <translation type="unfinished" /> </message> <message> @@ -43373,32 +43594,32 @@ <translation>Défaut</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="527" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="474" /> <source>Delete Host Fingerprint</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="528" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="475" /> <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="644" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="591" /> <source>Delete Host Minimum Protocol</source> <translation>Supprimer le protocole minimum de l'hôte</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="645" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="592" /> <source><p>Shall the minimum protocol entry for host <b>{0}</b> really be deleted?</p></source> <translation><p>Faut il vraiment supprimer le protocole minimum de l'hôte <b>{0}</b> ?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="708" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="655" /> <source>Edit User Configuration</source> <translation>Modifier la configuration utilisateur</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="709" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="656" /> <source>You will loose all changes made in this dialog. Shall the data be saved first?</source> <translation>Vous allez perdre toutes les modifications faites dans cette fenêtre. Faut-il sauvegarder d'abord ?</translation> </message> @@ -43477,17 +43698,17 @@ <context> <name>HgUtilities</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="130" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="132" /> <source>The hg process finished with the exit code {0}</source> <translation>Le processus hg s'est terminé avec le code de sortie {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="134" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="136" /> <source>The hg process did not finish within 30s.</source> <translation>Le processus hg n'a pas terminé dans les 30s.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="138" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="140" /> <source>Could not start the hg executable.</source> <translation>Ne peut démarrer l'exécutable hg.</translation> </message> @@ -50791,13 +51012,13 @@ <name>Lexers</name> <message> <location filename="../QScintilla/Lexers/__init__.py" line="412" /> - <location filename="../Preferences/__init__.py" line="599" /> + <location filename="../Preferences/__init__.py" line="598" /> <source>Python Files (*.py *.py3)</source> <translation>Fichiers Python (*.py *.py3)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="505" /> - <location filename="../Preferences/__init__.py" line="602" /> + <location filename="../Preferences/__init__.py" line="601" /> <source>Python3 Files (*.py)</source> <translation>Fichiers Python3 (*.py)</translation> </message> @@ -52636,8 +52857,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> @@ -53996,7 +54217,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> @@ -60339,75 +60560,13 @@ </message> <message> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to install the selected package</source> - <translation>Cliquer pour installer le package sélectionné</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to install the selected package to the user site</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to show details for the selected entry</source> - <translation>Cliquer pour montrer les détails de l'entrée sélectionnée</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Toggle to show or hide the search window</source> - <translation>Montrer/cacher la fenêtre de recherche</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Package</source> - <translation>Package</translation> + <source>Press to refresh the lists</source> + <translation>Cliquer pour rafraichir les listes</translation> </message> <message> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Enter the search term for the package name</source> - <translation>Entrer le terme de recherche pour le nom du package</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Enter search term</source> - <translation>Entrer le terme de recherche</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to start the search</source> - <translation>Cliquer pour démarrer la recherche</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to search for more packages</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Version</source> - <translation type="unfinished">Version</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Released</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Description</source> - <translation>Description</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to refresh the lists</source> - <translation>Cliquer pour rafraichir les listes</translation> + <source>Press to install a package.</source> + <translation type="unfinished" /> </message> <message> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> @@ -60426,6 +60585,17 @@ </message> <message> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Press to show details for the selected entry</source> + <translation>Cliquer pour montrer les détails de l'entrée sélectionnée</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Press to remove leftovers of an upgrade or uninstall run.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> <source>Select to show only locally-installed packages</source> <translation>Cocher pour montrer uniquement les packages installés localement</translation> </message> @@ -60469,6 +60639,13 @@ <message> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Package</source> + <translation>Package</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> <source>Installed</source> <translation type="unfinished" /> </message> @@ -60563,319 +60740,353 @@ <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="199" /> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Search Package:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Enter package name to search for.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Press to open a web browser for searching.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="83" /> <source>pip Menu</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="233" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="113" /> <source>Author:</source> <translation>Auteur :</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="234" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="114" /> <source>Author Email:</source> <translation>Courreil de l'auteur :</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="235" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="115" /> <source>Classifiers:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="236" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="116" /> <source>Entry Points:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="237" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="117" /> <source>Files:</source> <translation>Fichiers :</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="238" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="118" /> <source>Homepage:</source> <translation>Page d'accueil :</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="239" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="119" /> <source>Installer:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="240" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="120" /> <source>License:</source> <translation>Licence :</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="241" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="121" /> <source>Location:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="242" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="122" /> <source>Metadata Version:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="243" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="123" /> <source>Name:</source> <translation>Nom :</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="244" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="124" /> <source>Project URLs:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="245" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="125" /> <source>Requires:</source> <translation>Nécessite :</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="246" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="126" /> <source>Required By:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="247" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="127" /> <source>Summary:</source> <translation>Bilan :</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="248" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="128" /> <source>Version:</source> <translation>Version :</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="450" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="335" /> <source>Getting installed packages...</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="478" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="363" /> <source>Getting outdated packages...</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1231" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1051" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1038" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1002" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="735" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="729" /> + <source>Cleanup Environment</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="730" /> + <source>The environment cleanup was successful.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="736" /> + <source>Some leftover package directories could not been removed. Delete them manually.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="834" /> <source>Search PyPI</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1003" /> - <source><p>Received an error while searching for <b>{0}</b>.</p><p>Error: {1}</p></source> - <translation type="unfinished" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="835" /> + <source><p>No package details info for <b>{0}</b> available.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="854" /> + <source>Pip</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="856" /> + <source>Install Pip</source> + <translation>Installer pip</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="859" /> + <source>Install Pip to User-Site</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="862" /> + <source>Repair Pip</source> + <translation>Réparer Pip</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="869" /> + <source>Install</source> + <translation type="unfinished">Installer</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1048" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="871" /> + <source>Install Packages</source> + <translation>Installer des packages</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="874" /> + <source>Install Local Package</source> + <translation>Installer un package local</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="877" /> + <source>Re-Install Selected Packages</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="884" /> + <source>Requirements/Constraints</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="886" /> + <source>Install Requirements</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="889" /> + <source>Uninstall Requirements</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="892" /> + <source>Generate Requirements...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="896" /> + <source>Install from 'pyproject.toml'</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="900" /> + <source>Uninstall from 'pyproject.toml'</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="905" /> + <source>Generate Constraints...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="912" /> + <source>Cache</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="914" /> + <source>Show Cache Info...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="917" /> + <source>Show Cached Files...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="920" /> + <source>Remove Cached Files...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="923" /> + <source>Purge Cache...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="940" /> + <source>Show Licenses...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="944" /> + <source>Check Vulnerabilities</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="948" /> + <source>Update Vulnerability Database</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="952" /> + <source>Create SBOM file</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="959" /> + <source>Edit User Configuration...</source> + <translation>Éditer la configuration utilisateur...</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="962" /> + <source>Edit Environment Configuration...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="967" /> + <source>Configure...</source> + <translation>Configuration...</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1211" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1198" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1187" /> + <source>Edit Configuration</source> + <translation>Éditer la configuration</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1212" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1199" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1188" /> + <source>No valid configuration path determined. Aborting</source> + <translation>Pas de chemin de configuration déterminé. Annulation</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1421" /> + <source>{0} {1}</source> + <comment>package name, package version</comment> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1442" /> + <source>Affected Version:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1445" /> + <source>Advisory:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1580" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1555" /> + <source>unknown</source> + <translation type="unfinished">inconnu</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1577" /> + <source>any</source> + <translation type="unfinished" /> + </message> + <message> + <source>Press to install the selected package</source> + <translation type="vanished">Cliquer pour installer le package sélectionné</translation> + </message> + <message> + <source>Toggle to show or hide the search window</source> + <translation type="vanished">Montrer/cacher la fenêtre de recherche</translation> + </message> + <message> + <source>Enter the search term for the package name</source> + <translation type="vanished">Entrer le terme de recherche pour le nom du package</translation> + </message> + <message> + <source>Enter search term</source> + <translation type="vanished">Entrer le terme de recherche</translation> + </message> + <message> + <source>Press to start the search</source> + <translation type="vanished">Cliquer pour démarrer la recherche</translation> + </message> + <message> + <source>Version</source> + <translation type="vanished">Version</translation> + </message> + <message> + <source>Description</source> + <translation type="vanished">Description</translation> </message> <message numerus="yes"> - <location filename="../PipInterface/PipPackagesWidget.py" line="1018" /> <source>%n package(s) found.</source> - <translation> + <translation type="vanished"> <numerusform>%n package trouvé.</numerusform> <numerusform>%n packages trouvés.</numerusform> </translation> </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1025" /> - <source>Showing first {0} packages found.</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1044" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1039" /> - <source><p>There were no results for <b>{0}</b>.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1052" /> - <source><p>There were no more results for <b>{0}</b>.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1232" /> - <source><p>No package details info for <b>{0}</b> available.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1251" /> - <source>Pip</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1253" /> - <source>Install Pip</source> - <translation>Installer pip</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1256" /> - <source>Install Pip to User-Site</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1259" /> - <source>Repair Pip</source> - <translation>Réparer Pip</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1266" /> - <source>Install</source> - <translation type="unfinished">Installer</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1445" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1268" /> - <source>Install Packages</source> - <translation>Installer des packages</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1271" /> - <source>Install Local Package</source> - <translation>Installer un package local</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1274" /> - <source>Re-Install Selected Packages</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1281" /> - <source>Requirements/Constraints</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1283" /> - <source>Install Requirements</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1286" /> - <source>Uninstall Requirements</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1289" /> - <source>Generate Requirements...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1293" /> - <source>Install from 'pyproject.toml'</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1297" /> - <source>Uninstall from 'pyproject.toml'</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1302" /> - <source>Generate Constraints...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1309" /> - <source>Cache</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1311" /> - <source>Show Cache Info...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1314" /> - <source>Show Cached Files...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1317" /> - <source>Remove Cached Files...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1320" /> - <source>Purge Cache...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1337" /> - <source>Show Licenses...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1341" /> - <source>Check Vulnerabilities</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1345" /> - <source>Update Vulnerability Database</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1349" /> - <source>Create SBOM file</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1356" /> - <source>Edit User Configuration...</source> - <translation>Éditer la configuration utilisateur...</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1359" /> - <source>Edit Environment Configuration...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1364" /> - <source>Configure...</source> - <translation>Configuration...</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1608" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1595" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1584" /> - <source>Edit Configuration</source> - <translation>Éditer la configuration</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1609" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1596" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1585" /> - <source>No valid configuration path determined. Aborting</source> - <translation>Pas de chemin de configuration déterminé. Annulation</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1818" /> - <source>{0} {1}</source> - <comment>package name, package version</comment> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1839" /> - <source>Affected Version:</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1842" /> - <source>Advisory:</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1977" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1952" /> - <source>unknown</source> - <translation type="unfinished">inconnu</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1974" /> - <source>any</source> - <translation type="unfinished" /> - </message> </context> <context> <name>PipPackagesWindow</name> @@ -61708,64 +61919,69 @@ <name>PluginRepositoryWidget</name> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="124" /> - <source>Stable</source> - <translation>Stable</translation> + <source>Obsolete</source> + <translation>Obsolète</translation> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="125" /> - <source>Unstable</source> - <translation>Instable</translation> + <source>Stable</source> + <translation>Stable</translation> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="126" /> - <source>Obsolete</source> - <translation>Obsolète</translation> + <source>Unknown</source> + <translation>Inconnu</translation> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="127" /> - <source>Unknown</source> - <translation>Inconnu</translation> - </message> - <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="179" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="139" /> - <source>Update</source> - <translation>Mettre à jour</translation> + <source>Unstable</source> + <translation>Instable</translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="128" /> + <source>Upgrade Available</source> + <translation type="unfinished" /> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="182" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="145" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="142" /> + <source>Update</source> + <translation>Mettre à jour</translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="185" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="148" /> <source>Download</source> <translation>Télécharger</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="153" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="156" /> <source>Download & Install</source> <translation type="unfinished" /> </message> <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="191" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="164" /> + <source>Cancel</source> + <translation>Annuler</translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="170" /> + <source>Install</source> + <translation type="unfinished">Installer</translation> + </message> + <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="188" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="161" /> - <source>Cancel</source> - <translation>Annuler</translation> - </message> - <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="167" /> - <source>Install</source> - <translation type="unfinished">Installer</translation> - </message> - <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="185" /> <source>Download && Install</source> <translation>Télécharger && Installer</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="191" /> - <source>Close && Install</source> - <translation>Fermer && Installer</translation> - </message> - <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="194" /> + <source>Close && Install</source> + <translation>Fermer && Installer</translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="197" /> <source>Close</source> <translation type="unfinished">Fermer</translation> </message> @@ -61817,98 +62033,103 @@ <translation>Les plugins sélectionnés ont été téléchargés.</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="603" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="591" /> <source>Plugins Repository URL Changed</source> <translation>L'URL du dépot de plugins a changé</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="604" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="592" /> <source>The URL of the Plugins Repository has changed. Select the "Update" button to get the new repository file.</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="613" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="601" /> <source>Read plugins repository file</source> <translation>Lecture du référentiel de plugins</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="614" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="602" /> <source><p>The plugins repository file <b>{0}</b> could not be read. Select Update</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="623" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="611" /> <source>No plugin repository file available. Select Update.</source> <translation>Pas de fichier listing disponible. Cliquer sur "Mise à jour" pour récupérer la liste des plugins.</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="627" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="615" /> <source>New: <b>{0}</b></source> <translation>Nouveau : <b>{0}</b></translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="629" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="617" /> <source>Local Updates: <b>{0}</b></source> <translation>Mises à jour locales : <b>{0}</b></translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="632" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="620" /> <source>Remote Updates: <b>{0}</b></source> <translation>Mises à jour distantes: <b>{0}</b></translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="705" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="673" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="693" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="661" /> <source>Error downloading file</source> <translation>Erreur de téléchargement</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="706" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="674" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="694" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="662" /> <source><p>Could not download the requested file from {0}.</p><p>Error: {1}</p></source> <translation><p>Ne peut télécharger le fichier demandé depuis {0}.</p><p>Erreur : {1}</p></translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="677" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="665" /> <source>No connection to Internet.</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="849" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="810" /> <source>up-to-date</source> <translation>à jour</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="852" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="813" /> <source>new download available</source> <translation>nouveau téléchargement disponible</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="856" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="818" /> <source>update installable</source> <translation>mise à jour installable</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="860" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="823" /> <source>updated download available</source> <translation>téléchargement à jour disponible</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="864" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="828" /> <source>error determining status</source> <translation>erreur lors de la détermination du statu</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1269" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1239" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1002" /> + <source>{0}. {1}</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1346" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1316" /> <source>Cleanup of Plugin Downloads</source> <translation>Nettoyer les téléchargements de plugin</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1273" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1242" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1350" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1319" /> <source><p>The plugin download <b>{0}</b> could not be deleted.</p><p>Reason: {1}</p></source> <translation><p>Le téléchargement de plugin<b>{0}</b> ne peut être supprimé.</p><p>Raison : {1}</p></translation> </message> @@ -61916,17 +62137,17 @@ <context> <name>PluginRepositoryWindow</name> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1126" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1203" /> <source>Process Generation Error</source> <translation>Erreur du processus</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1127" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1204" /> <source><p>Could not start the process.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Ne peut démarrer le processus.<br>Vérifier qu'il est disponible en tant que<b>{0}</b>.</p></translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1131" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1208" /> <source>OK</source> <translation>OK</translation> </message> @@ -62303,18 +62524,18 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1908" /> + <location filename="../Preferences/__init__.py" line="1909" /> <source>Export Preferences</source> <translation>Export des préférences</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1937" /> - <location filename="../Preferences/__init__.py" line="1910" /> + <location filename="../Preferences/__init__.py" line="1938" /> + <location filename="../Preferences/__init__.py" line="1911" /> <source>Properties File (*.ini);;All Files (*)</source> <translation>Fichier propriétés (*.ini);;Tous les fichiers (*)</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1935" /> + <location filename="../Preferences/__init__.py" line="1936" /> <source>Import Preferences</source> <translation>Import des préférences</translation> </message> @@ -62880,79 +63101,79 @@ <translation>Gestionnaire conda</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="273" /> + <location filename="../Preferences/ProgramsDialog.py" line="275" /> <source>PyPI Package Management</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="525" /> - <location filename="../Preferences/ProgramsDialog.py" line="522" /> - <location filename="../Preferences/ProgramsDialog.py" line="506" /> - <location filename="../Preferences/ProgramsDialog.py" line="376" /> - <location filename="../Preferences/ProgramsDialog.py" line="309" /> - <location filename="../Preferences/ProgramsDialog.py" line="292" /> + <location filename="../Preferences/ProgramsDialog.py" line="527" /> + <location filename="../Preferences/ProgramsDialog.py" line="524" /> + <location filename="../Preferences/ProgramsDialog.py" line="508" /> + <location filename="../Preferences/ProgramsDialog.py" line="378" /> + <location filename="../Preferences/ProgramsDialog.py" line="311" /> + <location filename="../Preferences/ProgramsDialog.py" line="294" /> <source>(unknown)</source> <translation>(inconnu)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="296" /> + <location filename="../Preferences/ProgramsDialog.py" line="298" /> <source>Spell Checker - PyEnchant</source> <translation>Vérification d'orthographe - PyEnchant</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="313" /> + <location filename="../Preferences/ProgramsDialog.py" line="315" /> <source>Source Highlighter - Pygments</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="320" /> + <location filename="../Preferences/ProgramsDialog.py" line="322" /> <source>MicroPython - MPY Cross Compiler</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="327" /> + <location filename="../Preferences/ProgramsDialog.py" line="329" /> <source>MicroPython - ESP Tool</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="338" /> + <location filename="../Preferences/ProgramsDialog.py" line="340" /> <source>MicroPython - PyBoard Flasher</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="348" /> + <location filename="../Preferences/ProgramsDialog.py" line="350" /> <source>MicroPython - STLink Info</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="358" /> + <location filename="../Preferences/ProgramsDialog.py" line="360" /> <source>MicroPython - STLink Flasher</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="380" /> + <location filename="../Preferences/ProgramsDialog.py" line="382" /> <source>Code Assistant - Jedi</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="460" /> + <location filename="../Preferences/ProgramsDialog.py" line="462" /> <source>(not configured)</source> <translation>(non configuré)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="495" /> + <location filename="../Preferences/ProgramsDialog.py" line="497" /> <source>(module not found)</source> <translation>(module non trouvé)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="528" /> + <location filename="../Preferences/ProgramsDialog.py" line="530" /> <source>(not executable)</source> <translation>(non executable)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="574" /> + <location filename="../Preferences/ProgramsDialog.py" line="576" /> + <location filename="../Preferences/ProgramsDialog.py" line="544" /> <location filename="../Preferences/ProgramsDialog.py" line="542" /> - <location filename="../Preferences/ProgramsDialog.py" line="540" /> <source>(not found)</source> <translation>(non trouvé)</translation> </message> @@ -67158,7 +67379,7 @@ <translation>Alt+R</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="306" /> + <location filename="../Project/PropertiesDialog.py" line="312" /> <location filename="../Project/PropertiesDialog.py" line="71" /> <source>None</source> <translation type="unfinished" /> @@ -67184,12 +67405,12 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="261" /> + <location filename="../Project/PropertiesDialog.py" line="267" /> <source>Source Files ({0});;All Files (*)</source> <translation>Fichiers sources ({0});;Tous les fichiers (*)</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="265" /> + <location filename="../Project/PropertiesDialog.py" line="271" /> <source>All Files (*)</source> <translation type="unfinished">Tous fichiers (*)</translation> </message> @@ -67230,22 +67451,22 @@ <context> <name>Purge</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="76" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/purge.py" line="83" /> <source>Purge All Files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="77" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/purge.py" line="84" /> <source>Do really want to delete all files not tracked by Mercurial (including ignored ones)?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="82" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/purge.py" line="89" /> <source>Purge Files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="83" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/purge.py" line="90" /> <source>Do really want to delete files not tracked by Mercurial?</source> <translation type="unfinished" /> </message> @@ -67253,79 +67474,115 @@ <context> <name>PurgeProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="36" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="34" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="36" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="34" /> <source>Purge Files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="43" /> - <source>Delete files and directories not known to Mercurial</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="46" /> - <source><b>Purge Files</b><p>This deletes files and directories not known to Mercurial. That means that purge will delete:<ul><li>unknown files (marked with "not tracked" in the status dialog)</li><li>empty directories</li></ul>Note that ignored files will be left untouched.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="61" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="60" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="43" /> + <source>Delete not version controlled files and directories</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="46" /> + <source><b>Purge Files</b><p>This deletes not version controlled files and directories. That means that purge will delete:<ul><li>not version controlled files (marked with "not tracked" in the status dialog)</li><li>empty directories</li></ul>Note that ignored files will be left untouched.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="61" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="60" /> <source>Purge All Files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="68" /> - <source>Delete files and directories not known to Mercurial including ignored ones</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="74" /> - <source><b>Purge All Files</b><p>This deletes files and directories not known to Mercurial. That means that purge will delete:<ul><li>unknown files (marked with "not tracked" in the status dialog)</li><li>empty directories</li><li>ignored files and directories</li></ul></p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="89" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="68" /> + <source>Delete not version controlled files and directories including ignored ones</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="74" /> + <source><b>Purge All Files</b><p>This deletes not version controlled files and directories. That means that purge will delete:<ul><li>not version controlled files (marked with "not tracked" in the status dialog)</li><li>empty directories</li><li>ignored files and directories</li></ul></p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="90" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="89" /> + <source>Purge Ignored Files</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="97" /> + <source>Delete ignored files and directories</source> + <translation type="unfinished" /> + </message> + <message> + <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/PurgeExtension/ProjectHelper.py" line="91" /> + <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/PurgeExtension/ProjectHelper.py" line="98" /> - <source>List files and directories not known to Mercurial</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="101" /> - <source><b>List Files to be Purged</b><p>This lists files and directories not known to Mercurial. These would be deleted by the "Purge Files" menu entry.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="111" /> + <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="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="131" /> <source>List All Files to be Purged</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="112" /> + <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/PurgeExtension/ProjectHelper.py" line="119" /> - <source>List files and directories not known to Mercurial including ignored ones</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="125" /> - <source><b>List All Files to be Purged</b><p>This lists files and directories not known to Mercurial 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/PurgeExtension/ProjectHelper.py" line="163" /> + <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="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="156" /> + <source>List Ignored Files to be Purged</source> + <translation type="unfinished" /> + </message> + <message> + <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="164" /> + <source>List ignored files and directories</source> + <translation type="unfinished" /> + </message> + <message> + <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="206" /> <source>Purge</source> <translation type="unfinished" /> </message> @@ -76283,49 +76540,49 @@ <context> <name>Shelve</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="105" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="105" /> <source>Shelve current changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="151" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="151" /> <source>Restore shelved changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="170" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="170" /> <source>Abort restore operation</source> <translation>Abandonner l'opération de restoration</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="191" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="191" /> <source>Continue restore operation</source> <translation>Poursuivre l'opération de restoration</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="211" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="211" /> <source>Select the shelves to be deleted:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="231" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="222" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="231" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="222" /> <source>Delete shelves</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="223" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="223" /> <source>Do you really want to delete these shelves?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="249" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="242" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="249" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="242" /> <source>Delete all shelves</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="243" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="243" /> <source>Do you really want to delete all shelved changes?</source> <translation type="unfinished" /> </message> @@ -76333,21 +76590,21 @@ <context> <name>ShelveProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="62" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="57" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="52" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="47" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="62" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="57" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="52" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="47" /> <source>Shelve changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="122" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="74" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="122" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="74" /> <source>Shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="104" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="104" /> <source>The project should be reread. Do this now?</source> <translation>Le projet doit être relu. Le faire maintenant ?</translation> </message> @@ -76355,154 +76612,154 @@ <context> <name>ShelveProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="34" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="34" /> <source>Shelve changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="35" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="35" /> <source>Shelve changes...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="42" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="42" /> <source>Shelve all current changes of the project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="45" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="45" /> <source><b>Shelve changes</b><p>This shelves all current changes of the project.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="54" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="54" /> <source>Show shelve browser</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="55" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="55" /> <source>Show shelve browser...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="61" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="61" /> <source>Show a dialog with all shelves</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="63" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="63" /> <source><b>Show shelve browser...</b><p>This shows a dialog listing all available shelves. Actions on these shelves may be executed via the context menu.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="74" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="74" /> <source>Restore shelved change</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="75" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="75" /> <source>Restore shelved change...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="82" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="82" /> <source>Restore a shelved change to the project directory</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="85" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="85" /> <source><b>Restore shelved change</b><p>This restore a shelved change to the project directory.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="95" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="95" /> <source>Abort restore</source> <translation>Abandonner la restoration</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="96" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="96" /> <source>Abort restore...</source> <translation>Abandonner la restauration...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="103" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="103" /> <source>Abort the restore operation in progress</source> <translation>Abandonner les opérations de restauration en cours</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="106" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="106" /> <source><b>Abort restore</b><p>This aborts the restore operation in progress and reverts already applied changes.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="116" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="116" /> <source>Continue restore</source> <translation>Poursuivre la restauration</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="117" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="117" /> <source>Continue restore...</source> <translation>Poursuivre la restauration...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="124" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="124" /> <source>Continue the restore operation in progress</source> <translation>Poursuivre les opérations de restauration en cours</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="127" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="127" /> <source><b>Continue restore</b><p>This continues the restore operation in progress.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="136" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="136" /> <source>Delete shelved changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="137" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="137" /> <source>Delete shelved changes...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="144" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="144" /> <source><b>Delete shelved changes...</b><p>This opens a dialog to select the shelved changes to delete and deletes the selected ones.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="155" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="154" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="155" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="154" /> <source>Delete ALL shelved changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="162" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="162" /> <source><b>Delete ALL shelved changes</b><p>This deletes all shelved changes.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="231" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="202" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="231" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="202" /> <source>Shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="218" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="218" /> <source>The project should be reread. Do this now?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="244" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="244" /> <source>Unshelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="251" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="251" /> <source>Abort Unshelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="258" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="258" /> <source>Continue Unshelve</source> <translation type="unfinished" /> </message> @@ -79135,41 +79392,10 @@ </message> </context> <context> - <name>Strip</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/strip.py" line="68" /> - <source>Stripping changesets from repository</source> - <translation type="unfinished" /> - </message> - </context> - <context> <name>StripProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="37" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="35" /> - <source>Strip changesets</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="43" /> - <source>Strip changesets from a repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="45" /> - <source><b>Strip changesets</b><p>This deletes a changeset and all its descendants from a repository. Each removed changeset will be stored in .hg/strip-backup as a bundle file.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="91" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="79" /> - <source>Strip</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="92" /> <source>The project should be reread. Do this now?</source> - <translation>Le projet doit être relu. Le faire maintenant ?</translation> + <translation type="vanished">Le projet doit être relu. Le faire maintenant ?</translation> </message> </context> <context> @@ -80280,12 +80506,12 @@ <context> <name>SvnDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="165" /> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="168" /> <source>Process Generation Error</source> <translation>Erreur du processus</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="166" /> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="169" /> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Impossible de lancer le processus {0}. Assurez-vous qu'il est bien dans le chemin de recherche.</translation> </message> @@ -90765,6 +90991,66 @@ </message> </context> <context> + <name>Uncommit</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/uncommit.py" line="64" /> + <source>Undo Local Commit</source> + <translation type="unfinished" /> + </message> + </context> + <context> + <name>UncommitProjectBrowserHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="145" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="82" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="72" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="62" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="52" /> + <source>Undo Local Commit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="96" /> + <source>Uncommit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="126" /> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished">Le projet devrait être relu. Le faire maintenant ?</translation> + </message> + </context> + <context> + <name>UncommitProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="107" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="38" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="36" /> + <source>Undo Local Commit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="44" /> + <source>Undo the effect of a local commit.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="46" /> + <source><b>Undo Local Commit</b><p>This undoes the effect of a local commit, returning the affected files to their uncommitted state.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="79" /> + <source>Uncommit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="95" /> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished">Le projet devrait être relu. Le faire maintenant ?</translation> + </message> + </context> + <context> <name>UnittestExecutor</name> <message> <location filename="../Testing/Interfaces/UnittestExecutor.py" line="52" /> @@ -91411,7 +91697,7 @@ <translation><b>Enregistrer session...</b><p>Ceci enregistre la session sur le disque. Une fenêtre s'ouvre pour sélectionner le nom de fichier.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7892" /> + <location filename="../UI/UserInterface.py" line="7893" /> <location filename="../UI/UserInterface.py" line="1955" /> <location filename="../UI/UserInterface.py" line="1948" /> <source>Load session</source> @@ -92739,8 +93025,8 @@ <translation><b>Raccourcis claviers</b><p>Edite les raccourcis claviers pour l'application.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7600" /> - <location filename="../UI/UserInterface.py" line="7581" /> + <location filename="../UI/UserInterface.py" line="7601" /> + <location filename="../UI/UserInterface.py" line="7582" /> <location filename="../UI/UserInterface.py" line="3402" /> <source>Export Keyboard Shortcuts</source> <translation>Exporter les raccourcis clavier</translation> @@ -92761,7 +93047,7 @@ <translation><b>Exporter les raccourcis clavier</b><p>Exporte les raccourcis claviers de l'application.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7619" /> + <location filename="../UI/UserInterface.py" line="7620" /> <location filename="../UI/UserInterface.py" line="3421" /> <source>Import Keyboard Shortcuts</source> <translation>Importer des raccourcis clavier</translation> @@ -93487,169 +93773,169 @@ <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7108" /> - <location filename="../UI/UserInterface.py" line="7046" /> - <location filename="../UI/UserInterface.py" line="7002" /> - <location filename="../UI/UserInterface.py" line="6928" /> - <location filename="../UI/UserInterface.py" line="6864" /> - <source>Documentation Missing</source> - <translation>Documentation Manquante</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="7109" /> <location filename="../UI/UserInterface.py" line="7047" /> <location filename="../UI/UserInterface.py" line="7003" /> <location filename="../UI/UserInterface.py" line="6929" /> <location filename="../UI/UserInterface.py" line="6865" /> + <source>Documentation Missing</source> + <translation>Documentation Manquante</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7110" /> + <location filename="../UI/UserInterface.py" line="7048" /> + <location filename="../UI/UserInterface.py" line="7004" /> + <location filename="../UI/UserInterface.py" line="6930" /> + <location filename="../UI/UserInterface.py" line="6866" /> <source><p>The documentation starting point "<b>{0}</b>" could not be found.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7090" /> - <location filename="../UI/UserInterface.py" line="6972" /> - <source>Documentation</source> - <translation>Documentation</translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="6973" /> - <source><p>The PyQt{0} documentation starting point has not been configured.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="7091" /> + <location filename="../UI/UserInterface.py" line="6973" /> + <source>Documentation</source> + <translation>Documentation</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="6974" /> + <source><p>The PyQt{0} documentation starting point has not been configured.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7092" /> <source><p>The PySide{0} documentation starting point has not been configured.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7270" /> - <location filename="../UI/UserInterface.py" line="7206" /> - <source>Start Web Browser</source> - <translation>Démarrer le navigateur web</translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="7207" /> - <source>The eric web browser could not be started.</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="7271" /> + <location filename="../UI/UserInterface.py" line="7207" /> + <source>Start Web Browser</source> + <translation>Démarrer le navigateur web</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7208" /> + <source>The eric web browser could not be started.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7272" /> <source><p>The eric web browser is not started.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7317" /> + <location filename="../UI/UserInterface.py" line="7318" /> <source>Open Browser</source> <translation>Ouverture du navigateur</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7317" /> + <location filename="../UI/UserInterface.py" line="7318" /> <source>Could not start a web browser</source> <translation>Impossible de lancer le navigateur web</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7621" /> - <location filename="../UI/UserInterface.py" line="7583" /> + <location filename="../UI/UserInterface.py" line="7622" /> + <location filename="../UI/UserInterface.py" line="7584" /> <source>Keyboard Shortcuts File (*.ekj)</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7601" /> + <location filename="../UI/UserInterface.py" line="7602" /> <source><p>The keyboard shortcuts file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7805" /> + <location filename="../UI/UserInterface.py" line="7806" /> <source>Load crash session...</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7808" /> + <location filename="../UI/UserInterface.py" line="7809" /> <source>Clean crash sessions...</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7845" /> - <source>Read Session</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="7846" /> + <source>Read Session</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7847" /> <source><p>The session file <b>{0}</b> could not be read.</p></source> <translation><p>Le fichier de session <b>{0}</b> ne peut être lu.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7869" /> + <location filename="../UI/UserInterface.py" line="7870" /> <source>Save Session</source> <translation type="unfinished">Enregistrer la session</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7894" /> - <location filename="../UI/UserInterface.py" line="7871" /> + <location filename="../UI/UserInterface.py" line="7895" /> + <location filename="../UI/UserInterface.py" line="7872" /> <source>eric Session Files (*.esj)</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7963" /> - <source>Found Crash Sessions</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="7964" /> + <source>Found Crash Sessions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7965" /> <source>These crash session files were found. Select the one to open. Select 'Cancel' to not open a crash session.</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="8037" /> - <source>Clean stale crash sessions</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="8038" /> + <source>Clean stale crash sessions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8039" /> <source>Do you really want to delete these stale crash session files?</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="8414" /> - <source>Drop Error</source> - <translation>Erreur de suppression</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="8415" /> + <source>Drop Error</source> + <translation>Erreur de suppression</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8416" /> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> n'est pas un fichier.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="8612" /> - <source>Upgrade available</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="8613" /> + <source>Upgrade available</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8614" /> <source><p>A newer version of the <b>eric-ide</b> package is available at <a href="{0}/eric-ide/">PyPI</a>.</p><p>Installed: {1}<br/>Available: <b>{2}</b></p><p>Shall <b>eric-ide</b> be upgraded?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="8661" /> - <source>First time usage</source> - <translation>Première utilisation</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="8662" /> + <source>First time usage</source> + <translation>Première utilisation</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8663" /> <source>eric has not been configured yet. The configuration dialog will be started.</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="8684" /> + <location filename="../UI/UserInterface.py" line="8685" /> <source>Select Workspace Directory</source> <translation>Sélectionner le répertoire de travail</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="8852" /> - <source>Unsaved Data Detected</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="8853" /> + <source>Unsaved Data Detected</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8854" /> <source>Some editors contain unsaved data. Shall these be saved?</source> <translation type="unfinished" /> </message> @@ -100698,8 +100984,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>&Browsing History</source> - <translation>&Historique de navigation</translation> + <source>Browsing History</source> + <translation type="unfinished" /> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100738,8 +101024,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>&Search History</source> - <translation>Hi&storique de recherche</translation> + <source>Search History</source> + <translation type="unfinished" /> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100748,8 +101034,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>Download &History</source> - <translation>&Historique de téléchargement</translation> + <source>Download History</source> + <translation type="unfinished" /> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100758,8 +101044,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>&Cookies</source> - <translation>&Cookies</translation> + <source>Cookies</source> + <translation type="unfinished">Cookies</translation> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100768,7 +101054,7 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>Cached &Web Pages</source> + <source>Cached Web Pages</source> <translation type="unfinished" /> </message> <message> @@ -100778,8 +101064,18 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>Website &Icons</source> - <translation>&Icones de site web</translation> + <source>Website Icons</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> + <source>Select to clear the website permissions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> + <source>Website Permissions</source> + <translation type="unfinished" /> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100788,8 +101084,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>Saved &Passwords</source> - <translation>Mots de &passe enregistrés</translation> + <source>Saved Passwords</source> + <translation type="unfinished">Mots de passe enregistrés</translation> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100798,7 +101094,7 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>&Zoom Settings</source> + <source>Zoom Settings</source> <translation type="unfinished" /> </message> <message> @@ -100806,6 +101102,30 @@ <source>SSL Certificate Error Exceptions</source> <translation type="unfinished" /> </message> + <message> + <source>&Browsing History</source> + <translation type="vanished">&Historique de navigation</translation> + </message> + <message> + <source>&Search History</source> + <translation type="vanished">Hi&storique de recherche</translation> + </message> + <message> + <source>Download &History</source> + <translation type="vanished">&Historique de téléchargement</translation> + </message> + <message> + <source>&Cookies</source> + <translation type="vanished">&Cookies</translation> + </message> + <message> + <source>Website &Icons</source> + <translation type="vanished">&Icones de site web</translation> + </message> + <message> + <source>Saved &Passwords</source> + <translation type="vanished">Mots de &passe enregistrés</translation> + </message> </context> <context> <name>WebBrowserJavaScriptConsole</name> @@ -101341,6 +101661,16 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/WebBrowserPage.ui" line="0" /> + <source>Select to store website permission settings in memory only.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserPage.ui" line="0" /> + <source>Do not persist website permissions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserPage.ui" line="0" /> <source><p>Select to allow reading from all canvas elements.</p> <p><b>Note:</b> Disable this option to prevent canvas fingerprinting.</p></source> <translation type="unfinished" /> @@ -101753,32 +102083,87 @@ <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="194" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="78" /> + <source><p>Allow <b>{0}</b> to access your location information?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="83" /> + <source><p>Allow <b>{0}</b> to access your microphone?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="89" /> + <source><p>Allow <b>{0}</b> to access your webcam?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="95" /> + <source><p>Allow <b>{0}</b> to access your microphone and webcam?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="100" /> + <source><p>Allow <b>{0}</b> to lock your mouse cursor?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="105" /> + <source><p>Allow <b>{0}</b> to capture video of your desktop?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="111" /> + <source><p>Allow <b>{0}</b> to capture audio and video of your desktop?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="118" /> + <source><p>Allow <b>{0}</b> to show notifications on your desktop?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="124" /> + <source><p>Allow <b>{0}</b> to read from and write to the clipboard?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="130" /> + <source><p>Allow <b>{0}</b> to access fonts stored on this machine?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="269" /> <source>Suspicuous URL detected</source> <translation>URL suspectes détectées</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="195" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="270" /> <source><p>The URL <b>{0}</b> was found in the Safe Browsing database.</p>{1}</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="541" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="396" /> + <source>Permission Request</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="636" /> <source>Register Protocol Handler</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="542" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="637" /> <source><p>Allow the Web Site <b>{0}</b> to handle all <b>{1}</b> links?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="631" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="726" /> <source>SSL Info</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="632" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="727" /> <source>This site does not contain SSL information.</source> <translation type="unfinished" /> </message> @@ -104373,15 +104758,15 @@ <translation>Scanner le site courant</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5231" /> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5221" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5248" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5238" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2220" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2218" /> <source>IP Address Report</source> <translation>Rapport d'adresse IP</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5245" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5262" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2232" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2230" /> <source>Domain Report</source> @@ -104408,8 +104793,8 @@ <translation><b>Raccourcis claviers</b><p>Edite les raccourcis claviers pour l'application.</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5651" /> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5632" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5675" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5656" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2270" /> <source>Export Keyboard Shortcuts</source> <translation>Exporter les raccourcis clavier</translation> @@ -104430,7 +104815,7 @@ <translation><b>Exporter les raccourcis clavier</b><p>Exporte les raccourcis claviers de l'application.</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5671" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5695" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2289" /> <source>Import Keyboard Shortcuts</source> <translation>Importer les raccourcis clavier</translation> @@ -104680,99 +105065,99 @@ <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4768" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4785" /> <source>System</source> <translation type="unfinished">Système</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4772" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4789" /> <source>ISO</source> <translation>ISO</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4775" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4792" /> <source>Unicode</source> <translation>Unicode</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4778" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4795" /> <source>Windows</source> <translation>Windows</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4781" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4798" /> <source>IBM</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4784" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4801" /> <source>Apple</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4787" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4804" /> <source>Other</source> <translation>Autre</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4814" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4831" /> <source>Menu Bar</source> <translation>Barre de menu</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4819" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4836" /> <source>Bookmarks</source> <translation>Signets</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4824" /> - <source>Status Bar</source> - <translation>Barre de statut</translation> - </message> - <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4839" /> - <source>&Show all</source> - <translation>Tout &afficher</translation> - </message> - <message> <location filename="../WebBrowser/WebBrowserWindow.py" line="4841" /> + <source>Status Bar</source> + <translation>Barre de statut</translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4856" /> + <source>&Show all</source> + <translation>Tout &afficher</translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4858" /> <source>&Hide all</source> <translation>Tout &masquer</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5187" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5204" /> <source>VirusTotal Scan</source> <translation>Scan VirusTotal</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5188" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5205" /> <source><p>The VirusTotal scan could not be scheduled.<p> <p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5222" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5239" /> <source>Enter a valid IPv4 address in dotted quad notation:</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5232" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5249" /> <source>The given IP address is not in dotted quad notation.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5246" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5263" /> <source>Enter a valid domain name:</source> <translation>Entrer un nom de domaine valide :</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5673" /> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5634" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5697" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5658" /> <source>Keyboard Shortcuts File (*.ekj)</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5652" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5676" /> <source><p>The keyboard shortcuts file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished" /> </message> @@ -105876,32 +106261,32 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1383" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1389" /> <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>Parent #{0}</b></td><td></td></tr> <tr><td><b>Modifications</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1955" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1391" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1964" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397" /> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Étiquettes</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1961" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1970" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1403" /> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Signets</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1968" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1404" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1977" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1410" /> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branches</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1410" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1416" /> <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> @@ -105910,7 +106295,7 @@ <tr><td><b>Heure de soumission</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1429" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1435" /> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -105921,36 +106306,36 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1929" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1938" /> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1936" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945" /> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1943" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1952" /> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Suggestion</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1948" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1957" /> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Modifications</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1975" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1984" /> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Parents</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1981" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990" /> <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>
--- a/src/eric7/i18n/eric7_it.ts Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/i18n/eric7_it.ts Tue Jan 14 17:29:56 2025 +0100 @@ -7727,18 +7727,18 @@ <translation>Grafica</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="896" /> + <location filename="../Preferences/ConfigurationDialog.py" line="903" /> <location filename="../Preferences/ConfigurationDialog.py" line="228" /> <source>Hex Editor</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1129" /> - <location filename="../Preferences/ConfigurationDialog.py" line="1090" /> - <location filename="../Preferences/ConfigurationDialog.py" line="982" /> - <location filename="../Preferences/ConfigurationDialog.py" line="944" /> - <location filename="../Preferences/ConfigurationDialog.py" line="913" /> - <location filename="../Preferences/ConfigurationDialog.py" line="882" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1136" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1097" /> + <location filename="../Preferences/ConfigurationDialog.py" line="989" /> + <location filename="../Preferences/ConfigurationDialog.py" line="951" /> + <location filename="../Preferences/ConfigurationDialog.py" line="920" /> + <location filename="../Preferences/ConfigurationDialog.py" line="889" /> <location filename="../Preferences/ConfigurationDialog.py" line="785" /> <location filename="../Preferences/ConfigurationDialog.py" line="670" /> <location filename="../Preferences/ConfigurationDialog.py" line="235" /> @@ -7756,7 +7756,7 @@ <translation type="unfinished">Log-Viewer</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1104" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1111" /> <location filename="../Preferences/ConfigurationDialog.py" line="250" /> <source>MicroPython</source> <translation type="unfinished" /> @@ -7773,8 +7773,9 @@ <translation>Rete</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1111" /> - <location filename="../Preferences/ConfigurationDialog.py" line="958" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1118" /> + <location filename="../Preferences/ConfigurationDialog.py" line="965" /> + <location filename="../Preferences/ConfigurationDialog.py" line="806" /> <location filename="../Preferences/ConfigurationDialog.py" line="271" /> <source>Network Proxy</source> <translation type="unfinished">Usa un proxy</translation> @@ -7785,13 +7786,13 @@ <translation>Notificazioni</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="927" /> + <location filename="../Preferences/ConfigurationDialog.py" line="934" /> <location filename="../Preferences/ConfigurationDialog.py" line="285" /> <source>PDF Viewer</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="965" /> + <location filename="../Preferences/ConfigurationDialog.py" line="972" /> <location filename="../Preferences/ConfigurationDialog.py" line="292" /> <source>Python Package Management</source> <translation type="unfinished" /> @@ -7802,7 +7803,7 @@ <translation>Gestore plugin</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="806" /> + <location filename="../Preferences/ConfigurationDialog.py" line="813" /> <location filename="../Preferences/ConfigurationDialog.py" line="684" /> <location filename="../Preferences/ConfigurationDialog.py" line="306" /> <source>Printer</source> @@ -7819,13 +7820,13 @@ <translation>Qt</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="813" /> + <location filename="../Preferences/ConfigurationDialog.py" line="820" /> <location filename="../Preferences/ConfigurationDialog.py" line="321" /> <source>Security</source> <translation>Sicurezza</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="996" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1003" /> <location filename="../Preferences/ConfigurationDialog.py" line="328" /> <source>Shell</source> <translation>Shell</translation> @@ -7841,7 +7842,7 @@ <translation>Modello</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="865" /> + <location filename="../Preferences/ConfigurationDialog.py" line="872" /> <location filename="../Preferences/ConfigurationDialog.py" line="343" /> <source>Tray Starter</source> <translation>Tray Starter</translation> @@ -7857,7 +7858,7 @@ <translation>Debugger</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1003" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1010" /> <location filename="../Preferences/ConfigurationDialog.py" line="698" /> <location filename="../Preferences/ConfigurationDialog.py" line="399" /> <location filename="../Preferences/ConfigurationDialog.py" line="364" /> @@ -7892,14 +7893,14 @@ <translation>Gestione file</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1010" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1017" /> <location filename="../Preferences/ConfigurationDialog.py" line="712" /> <location filename="../Preferences/ConfigurationDialog.py" line="413" /> <source>Searching</source> <translation>Ricerca</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="848" /> + <location filename="../Preferences/ConfigurationDialog.py" line="855" /> <location filename="../Preferences/ConfigurationDialog.py" line="719" /> <location filename="../Preferences/ConfigurationDialog.py" line="648" /> <location filename="../Preferences/ConfigurationDialog.py" line="420" /> @@ -7907,7 +7908,7 @@ <translation>Correzione automatica</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1017" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1024" /> <location filename="../Preferences/ConfigurationDialog.py" line="726" /> <location filename="../Preferences/ConfigurationDialog.py" line="427" /> <source>Style</source> @@ -7930,14 +7931,14 @@ <translation>Esportatori</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1024" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1031" /> <location filename="../Preferences/ConfigurationDialog.py" line="455" /> <source>Autocompletion</source> <translation>Autocompletamento</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1045" /> - <location filename="../Preferences/ConfigurationDialog.py" line="1031" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1052" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1038" /> <location filename="../Preferences/ConfigurationDialog.py" line="483" /> <location filename="../Preferences/ConfigurationDialog.py" line="462" /> <source>QScintilla</source> @@ -7951,13 +7952,13 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1038" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1045" /> <location filename="../Preferences/ConfigurationDialog.py" line="476" /> <source>Calltips</source> <translation>Calltips</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1052" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1059" /> <location filename="../Preferences/ConfigurationDialog.py" line="740" /> <location filename="../Preferences/ConfigurationDialog.py" line="497" /> <source>Highlighters</source> @@ -7970,21 +7971,21 @@ <translation>Associazione tipi file</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1059" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1066" /> <location filename="../Preferences/ConfigurationDialog.py" line="754" /> <location filename="../Preferences/ConfigurationDialog.py" line="511" /> <source>Styles</source> <translation>Stili</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1066" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1073" /> <location filename="../Preferences/ConfigurationDialog.py" line="761" /> <location filename="../Preferences/ConfigurationDialog.py" line="518" /> <source>Keywords</source> <translation>Parole chiave</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1073" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1080" /> <location filename="../Preferences/ConfigurationDialog.py" line="768" /> <location filename="../Preferences/ConfigurationDialog.py" line="525" /> <source>Properties</source> @@ -8001,7 +8002,7 @@ <translation>Aiuto</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="820" /> + <location filename="../Preferences/ConfigurationDialog.py" line="827" /> <location filename="../Preferences/ConfigurationDialog.py" line="553" /> <source>Help Documentation</source> <translation>Aiuto Documentazione</translation> @@ -8028,12 +8029,12 @@ <translation>Multiprogetto</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1136" /> - <location filename="../Preferences/ConfigurationDialog.py" line="1097" /> - <location filename="../Preferences/ConfigurationDialog.py" line="989" /> - <location filename="../Preferences/ConfigurationDialog.py" line="951" /> - <location filename="../Preferences/ConfigurationDialog.py" line="920" /> - <location filename="../Preferences/ConfigurationDialog.py" line="889" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1143" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1104" /> + <location filename="../Preferences/ConfigurationDialog.py" line="996" /> + <location filename="../Preferences/ConfigurationDialog.py" line="958" /> + <location filename="../Preferences/ConfigurationDialog.py" line="927" /> + <location filename="../Preferences/ConfigurationDialog.py" line="896" /> <location filename="../Preferences/ConfigurationDialog.py" line="792" /> <location filename="../Preferences/ConfigurationDialog.py" line="677" /> <location filename="../Preferences/ConfigurationDialog.py" line="602" /> @@ -8052,47 +8053,47 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="827" /> + <location filename="../Preferences/ConfigurationDialog.py" line="834" /> <location filename="../Preferences/ConfigurationDialog.py" line="627" /> <source>Appearance</source> <translation>Aspetto</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="834" /> - <location filename="../Preferences/ConfigurationDialog.py" line="634" /> - <source>eric Web Browser</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Preferences/ConfigurationDialog.py" line="841" /> + <location filename="../Preferences/ConfigurationDialog.py" line="634" /> + <source>eric Web Browser</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationDialog.py" line="848" /> <location filename="../Preferences/ConfigurationDialog.py" line="641" /> <source>VirusTotal Interface</source> <translation>Interfaccia VirusTotal</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1228" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1235" /> <source>Enter search text...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1303" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1310" /> <source>Preferences</source> <translation>Preferenze</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1309" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1316" /> <source>Please select an entry of the list to display the configuration page.</source> <translation>Selezionare un elemento della lista da mostrare nella pagina di configurazione.</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1392" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1399" /> <source>Configuration Page Error</source> <translation>Configurazione pagine errore</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1393" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1400" /> <source><p>The configuration page <b>{0}</b> could not be loaded.</p></source> <translation><p>La pagina di configurazione <b>{0}</b> non può essere caricata.</p></translation> </message> @@ -10663,12 +10664,12 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="1691" /> + <location filename="../Debugger/DebuggerInterfacePython.py" line="1692" /> <source>Debug Protocol Error</source> <translation type="unfinished" /> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="1692" /> + <location filename="../Debugger/DebuggerInterfacePython.py" line="1693" /> <source><p>The response received from the debugger backend could not be decoded. Please report this issue with the received data to the eric bugs email address.</p><p>Error: {0}</p><p>Data:<br/>{1}</p></source> <translation type="unfinished" /> </message> @@ -22699,64 +22700,147 @@ </message> </context> <context> + <name>Fastexport</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="183" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="174" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="168" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="159" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="133" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="113" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="57" /> + <source>Mercurial Fastexport</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="58" /> + <source><p>The output file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="107" /> + <source>Cancel</source> + <translation type="unfinished">Cancella</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="110" /> + <source>%v/%m Changesets</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="116" /> + <source>Exporting repository (time remaining: {0}) ...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="134" /> + <source><p>The repository fastexport process sent an error message.</p><p>{0}</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="160" /> + <source><p>The repository fastexport process finished successfully.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="169" /> + <source><p>The repository fastexport process was cancelled.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="175" /> + <source><p>The repository fastexport process finished with exit code <b>{0}</b>.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="184" /> + <source><p>The repository fastexport process crashed.</p></source> + <translation type="unfinished" /> + </message> + </context> + <context> + <name>FastexportProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="37" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="35" /> + <source>Export to git</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="44" /> + <source>Export the repository as git fast-import stream.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="47" /> + <source><b>Export to git</b><p>This exports the repository as a git fast-import stream.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="79" /> + <source>Fastexport</source> + <translation type="unfinished" /> + </message> + </context> + <context> <name>FeaturePermissionBar</name> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="48" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="50" /> <source>{0} wants to use your position.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="51" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="53" /> <source>{0} wants to use your microphone.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="54" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="56" /> <source>{0} wants to use your camera.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="57" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="59" /> <source>{0} wants to use your microphone and camera.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="60" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="62" /> <source>{0} wants to lock your mouse.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="61" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="63" /> <source>{0} wants to capture video of your screen.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="64" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="66" /> <source>{0} wants to capture audio and video of your screen.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="67" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="69" /> <source>{0} wants to use desktop notifications.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="92" /> - <source>Remember</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="94" /> + <source>Remember</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="96" /> <source>Allow</source> <translation type="unfinished">Consenti</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="95" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="97" /> <source>Deny</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="120" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="122" /> <source>{0} wants to use an unknown feature.</source> <translation type="unfinished" /> </message> @@ -22764,80 +22848,106 @@ <context> <name>FeaturePermissionsDialog</name> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="161" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="143" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="127" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="109" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="93" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="79" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="65" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="49" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="208" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="190" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="170" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="152" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="136" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="118" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="102" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="88" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="74" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="58" /> <source>Host</source> <translation type="unfinished">Host</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="162" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="144" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="128" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="110" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="94" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="80" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="66" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="50" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="209" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="191" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="171" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="153" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="137" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="119" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="103" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="89" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="75" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="59" /> <source>Permission</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="54" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="63" /> <source>Notifications</source> <translation type="unfinished">Notificazioni</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="68" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="77" /> <source>Geolocation</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="82" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="91" /> <source>Microphone</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="96" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="105" /> <source>Camera</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="114" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="123" /> <source>Microphone && Camera</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="130" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="139" /> <source>Mouse Lock</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="148" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="157" /> <source>Desktop Video</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="166" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="175" /> <source>Desktop Audio && Video</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="181" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="195" /> + <source>Clipboard</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="213" /> + <source>Local Fonts</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="296" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="253" /> <source>Allow</source> <translation type="unfinished">Consenti</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="182" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="297" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="254" /> <source>Deny</source> <translation type="unfinished" /> </message> <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="255" /> + <source>Always Ask</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="256" /> + <source>Invalid</source> + <translation type="unfinished" /> + </message> + <message> <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.ui" line="0" /> <source>HTML5 Feature Permissions</source> <translation type="unfinished" /> @@ -24708,74 +24818,74 @@ <translation type="unfinished">{0} ({1})</translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="750" /> + <location filename="../UI/FindFileWidget.py" line="749" /> <source>Invalid search expression</source> <translation type="unfinished">Espressione di ricerca non valida</translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="751" /> + <location filename="../UI/FindFileWidget.py" line="750" /> <source><p>The search expression is not valid.</p><p>Error: {0}</p></source> <translation type="unfinished"><p>L'espressione di ricerca non è valida.</p><p>Errore: {0}</p></translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="878" /> + <location filename="../UI/FindFileWidget.py" line="877" /> <source>{0} / {1}</source> <comment>occurrences / files</comment> <translation type="unfinished" /> </message> <message numerus="yes"> - <location filename="../UI/FindFileWidget.py" line="881" /> + <location filename="../UI/FindFileWidget.py" line="880" /> <source>%n occurrence(s)</source> <translation type="unfinished"> <numerusform /> </translation> </message> <message numerus="yes"> - <location filename="../UI/FindFileWidget.py" line="882" /> + <location filename="../UI/FindFileWidget.py" line="881" /> <source>%n file(s)</source> <translation type="unfinished"> <numerusform /> </translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1081" /> - <location filename="../UI/FindFileWidget.py" line="1056" /> - <location filename="../UI/FindFileWidget.py" line="1042" /> + <location filename="../UI/FindFileWidget.py" line="1080" /> + <location filename="../UI/FindFileWidget.py" line="1055" /> + <location filename="../UI/FindFileWidget.py" line="1041" /> <source>Replace in Files</source> <translation type="unfinished">Sostituisci nei file</translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1043" /> + <location filename="../UI/FindFileWidget.py" line="1042" /> <source><p>Could not read the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation type="unfinished"><p>Non posso leggere il file<b>{0}</b>. Lo salto.</p><p>Motivo:{1}</p></translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1057" /> + <location filename="../UI/FindFileWidget.py" line="1056" /> <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 type="unfinished"><p>L'hash originale e quello corrente del file <b>{0}</b> sono differenti. Lo salto.</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p></translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1082" /> + <location filename="../UI/FindFileWidget.py" line="1081" /> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation type="unfinished"><p>Non posso salvare il file<b>{0}</b>. Lo salto.</p><p>Motivo:{1}</p></translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1111" /> + <location filename="../UI/FindFileWidget.py" line="1110" /> <source>Open</source> <translation type="unfinished">Apri</translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1113" /> + <location filename="../UI/FindFileWidget.py" line="1112" /> <source>Copy Path to Clipboard</source> <translation type="unfinished">Copia il path nella Clipboard</translation> </message> <message> + <location filename="../UI/FindFileWidget.py" line="1116" /> + <source>Select All</source> + <translation type="unfinished">Seleziona tutti</translation> + </message> + <message> <location filename="../UI/FindFileWidget.py" line="1117" /> - <source>Select All</source> - <translation type="unfinished">Seleziona tutti</translation> - </message> - <message> - <location filename="../UI/FindFileWidget.py" line="1118" /> <source>Deselect All</source> <translation type="unfinished" /> </message> @@ -26953,37 +27063,37 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="91" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="94" /> <source>Additional Output</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="110" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="113" /> <source>Process canceled.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="124" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="127" /> <source>Process finished successfully.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="126" /> - <source>Process crashed.</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="129" /> + <source>Process crashed.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="132" /> <source>Process finished with exit code {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="195" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="198" /> <source>Process Generation Error</source> <translation type="unfinished">Errore Generazione Processo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="196" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="199" /> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished" /> </message> @@ -35353,456 +35463,456 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="303" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="309" /> <source>Create project repository</source> <translation>Crea il repository del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="304" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="310" /> <source>The project repository could not be created.</source> <translation>Il repository del progetto non può essere creato.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="338" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="344" /> <source>Creating Mercurial repository</source> <translation>Creazione repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="359" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="365" /> <source>Initial commit to Mercurial repository</source> <translation>Commit iniziale nel repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="405" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="411" /> <source>Cloning project from a Mercurial repository</source> <translation>Clonazione del progetto dal repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="516" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="522" /> <source>Commit Changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="517" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="523" /> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="580" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="586" /> <source>Committing changes to Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="679" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="685" /> <source>Synchronizing with the Mercurial repository</source> <translation>Sincronizzazione con il repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="719" /> <source>Adding files/directories to the Mercurial repository</source> <translation>Aggiunta di file/directory al repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="774" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="780" /> <source>Removing files/directories from the Mercurial repository</source> <translation>Rimozione di file/directory dal repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="829" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="835" /> <source>Renaming {0}</source> <translation>Rinomino {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="964" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="970" /> <source>Tagging in the Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1011" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1000" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1017" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006" /> <source>Revert changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1001" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1007" /> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1012" /> - <source>Do you really want to revert all changes of the project?</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1018" /> + <source>Do you really want to revert all changes of the project?</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1024" /> <source>Reverting changes</source> <translation>Annullamento modifiche</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1064" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1070" /> <source>Merging</source> <translation>Merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1095" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1109" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101" /> <source>Re-Merge</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1102" /> <source>Do you really want to re-merge these files or directories?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1104" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1110" /> <source>Do you really want to re-merge the project?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1114" /> <source>Re-Merging</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1131" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1137" /> <source>Current branch tip</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1314" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1320" /> <source>Mercurial command</source> <translation>Comando Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1492" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1498" /> <source>Copying {0}</source> <translation>Copia di {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1758" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1746" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1764" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1752" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743" /> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1759" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1765" /> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"><p>Il file <b>{0}</b> non può essere letto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2457" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2446" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2436" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1835" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2455" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844" /> <source>Apply changegroups</source> <translation>Applica changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1838" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1847" /> <source>Pulling from a remote Mercurial repository</source> <translation>Pulling da un repository Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1884" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1893" /> <source>Pushing to a remote Mercurial repository</source> <translation>Pushing in un repository Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2027" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2036" /> <source>Marking as 'unresolved'</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2029" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038" /> <source>Marking as 'resolved'</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2051" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060" /> <source>Aborting uncommitted merge</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2084" /> <source>Creating branch in the Mercurial repository</source> <translation>Creazione Branch nel repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086" /> - <source>Created new branch <{0}>.</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2095" /> + <source>Created new branch <{0}>.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2104" /> <source>Showing current branch</source> <translation>Visualizzazione branch corrente</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2184" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193" /> <source>Verifying the integrity of the Mercurial repository</source> <translation>Verifica dell'integrità del repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2200" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209" /> <source>Showing the combined configuration settings</source> <translation>Visualizzazione combinata della impostazioni di configurazione</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2224" /> <source>Showing aliases for remote repositories</source> <translation>Visualizzazione degli alias per i repository remoti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2230" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239" /> <source>Recovering from interrupted transaction</source> <translation>Recupero da una transazione interrotta</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254" /> <source>Identifying project directory</source> <translation>Identificazione directory del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2291" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2300" /> <source>Create .hgignore file</source> <translation>Crea il file .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2292" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301" /> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Il file <b>{0}</b> esiste già. Sovrascriverlo ?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2395" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2369" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2351" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2404" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2378" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2360" /> <source>Create changegroup</source> <translation>Crea changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2353" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362" /> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Changegroup Files (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2370" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2379" /> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Il file changegroup di Mercurial<b>{0}</b> esiste già. Sovrascriverlo ?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2409" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2418" /> <source>Preview changegroup</source> <translation>Anteprima changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2438" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2411" /> - <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> - <translation>Mercurial Changegroup Files (*.hg);;All Files (*)</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2447" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2420" /> + <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> + <translation>Mercurial Changegroup Files (*.hg);;All Files (*)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2456" /> <source>Shall the working directory be updated?</source> <translation>Le directory di lavoro devono essere aggiornate ?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2479" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2488" /> <source>Bisect subcommand ({0}) invalid.</source> <translation>Sottocomando Bisect ({0}) non valido.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2501" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2510" /> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2527" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2536" /> <source>Removing files from the Mercurial repository only</source> <translation>Rimozione di file dal solo repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2576" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2557" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2585" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2566" /> <source>Backing out changeset</source> <translation>Ritiro changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2558" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2567" /> <source>No revision given. Aborting...</source> <translation>Nessuna revisione fornita. Termino...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2587" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2602" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2596" /> <source>Rollback last transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2588" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2597" /> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2657" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2666" /> <source>Import Patch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2707" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2716" /> <source>Export Patches</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2749" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2758" /> <source>Change Phase</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2804" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813" /> <source>Copy Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2843" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2852" /> <source>Copy Changesets (Continue)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2853" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2862" /> <source>Copy Changesets (Stop)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2863" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2872" /> <source>Copy Changesets (Abort)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2887" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2896" /> <source>Create Unversioned Archive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2902" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2911" /> <source>Delete All Backups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2903" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2912" /> <source><p>Do you really want to delete all backup bundles stored in the backup area?<br/><b>{0}</b></p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2994" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2974" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2963" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2983" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2972" /> <source>Add Sub-repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3033" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2964" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3042" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2973" /> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2975" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2984" /> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3051" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3060" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3004" /> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3050" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3032" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3018" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3059" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3027" /> <source>Remove Sub-repositories</source> <translation type="unfinished">Rimuovi sotto-archivi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3019" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3028" /> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3296" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3138" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3147" /> <source>Mercurial Command Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3139" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3148" /> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3297" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3321" /> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3420" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3444" /> <source>Mercurial Bookmark</source> <translation type="unfinished">Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3437" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3461" /> <source>Delete Bookmark</source> <translation type="unfinished">Cancella segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3438" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3462" /> <source>Select the bookmark to be deleted:</source> <translation type="unfinished">Seleziona il segnalibro da cancellare:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3449" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3473" /> <source>Delete Mercurial Bookmark</source> <translation type="unfinished">Cancella Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3476" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3500" /> <source>Rename Mercurial Bookmark</source> <translation type="unfinished">Rinomina Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3518" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3542" /> <source>Move Mercurial Bookmark</source> <translation type="unfinished">Sposta Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3600" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3624" /> <source>Pull Bookmark</source> <translation type="unfinished">Estrai Segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3601" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3625" /> <source>Select the bookmark to be pulled:</source> <translation type="unfinished">Seleziona il segnalibro da estrarre:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3613" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3637" /> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished">Etrae segnalibro da un repository Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3641" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3665" /> <source>Push Bookmark</source> <translation type="unfinished">Inserisce Segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3642" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3666" /> <source>Select the bookmark to be push:</source> <translation type="unfinished">Seleziona il segnalibro da inserire:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3657" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3681" /> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished">Inserisce segnalibro in un repository Mercurial remoto</translation> </message> @@ -36645,42 +36755,42 @@ <context> <name>HgClient</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="98" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="100" /> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="147" /> - <source>Did not receive the 'hello' message.</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="149" /> + <source>Did not receive the 'hello' message.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="151" /> <source>Received data on unexpected channel.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="154" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="156" /> <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="159" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="161" /> <source>'capabilities' message did not contain any capability.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="168" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="170" /> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="173" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="175" /> <source>'encoding' message did not contain any encoding.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="385" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="387" /> <source>For message see output dialog.</source> <translation type="unfinished" /> </message> @@ -37046,6 +37156,11 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="0" /> + <source>%v/%m</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="0" /> <source>Errors</source> <translation>Errori</translation> </message> @@ -37089,6 +37204,11 @@ <source>Alt+P</source> <translation type="unfinished">Alt+P</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="211" /> + <source>Time remaining: {0}</source> + <translation type="unfinished" /> + </message> </context> <context> <name>HgDiffDialog</name> @@ -37268,6 +37388,69 @@ </message> </context> <context> + <name>HgFastexportConfigDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>fastexport Configuration</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the path of the file for the exported marks.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the path of the output file.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Revisions:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the path of the file containing already exported marks.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Author Map:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Import Marks:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Export Marks:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Output File:</source> + <translation type="unfinished">File di Output:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the revisions, tags or branches to be exported (separated by comma).</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the path of the author map file.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.py" line="42" /> + <source>Text Files (*.txt);;All Files (*)</source> + <translation type="unfinished">File Testo(*.txt);;Tutti i file (*)</translation> + </message> + </context> + <context> <name>HgGpgSignDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="0" /> @@ -38079,7 +38262,7 @@ <translation type="unfinished">Visualizza</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3049" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3063" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298" /> <source>Select Branches</source> <translation type="unfinished" /> @@ -38120,7 +38303,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2218" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2227" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> <source>Copy Changesets</source> <translation type="unfinished" /> @@ -38177,8 +38360,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2312" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2295" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2321" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2304" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="387" /> <source>Switch</source> <translation type="unfinished" /> @@ -38209,263 +38392,270 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2430" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1622" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="415" /> - <source>Pull Changes</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="418" /> - <source>Pull changes from a remote repository</source> - <translation type="unfinished">Pull changes da un repository remoto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="420" /> + <source>Pull Selected Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="419" /> + <source>Pull selected changes from a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="423" /> + <source>Pull All Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="427" /> + <source>Pull all changes from a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="430" /> <source>Pull Large Files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="422" /> - <source>Pull large files for selected revisions</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="428" /> - <source>Push Selected Changes</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="432" /> - <source>Push changes of the selected changeset and its ancestors to a remote repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="439" /> - <source>Push All Changes</source> + <source>Pull large files for selected revisions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="438" /> + <source>Push Selected Changes</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="442" /> - <source>Push all changes to a remote repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="448" /> - <source>Create Changegroup</source> + <source>Push changes of the selected changeset and its ancestors to a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="449" /> + <source>Push All Changes</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="452" /> + <source>Push all changes to a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="458" /> + <source>Create Changegroup</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="462" /> <source>Create a changegroup file containing the selected changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="455" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="465" /> <source><b>Create Changegroup</b> <p>This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2569" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="468" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2583" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="478" /> <source>Apply Changegroup</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="472" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="482" /> <source>Apply the currently viewed changegroup file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="489" /> <source>Sign Revisions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="483" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="493" /> <source>Add a signature for the selected revisions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="487" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="497" /> <source>Verify Signatures</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="491" /> - <source>Verify all signatures there may be for the selected revision</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2476" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498" /> - <source>Strip Changesets</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="501" /> + <source>Verify all signatures there may be for the selected revision</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="508" /> + <source>Strip Changesets</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="511" /> <source>Strip changesets from a repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="506" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="516" /> <source>Select All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="509" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="519" /> <source>Deselect All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="958" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="934" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="911" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="885" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="968" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="944" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="921" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="895" /> <source>Mercurial Error</source> <translation>Mercurial Error</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1266" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1276" /> <source>{0} (large file)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1532" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1542" /> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1543" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1553" /> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1701" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1620" /> - <source>Pull Selected Changes</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2570" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2477" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2431" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2313" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2219" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2584" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2491" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2322" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2228" /> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Il progetto deve essere riletto. Farlo ora ?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2296" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2305" /> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2341" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2350" /> <source>Define Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2342" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2351" /> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2371" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2380" /> <source>Move Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2372" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2381" /> <source>Select the bookmark to be moved to changeset '{0}':</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2444" /> + <source>Pull Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2727" /> <source>Find Commit</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2714" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728" /> <source>'{0}' was not found.</source> <translation type="unfinished">'{0}' non è stato trovato.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2774" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2788" /> <source>Generating differences ...</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2775" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2789" /> <source>Differences</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2794" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2808" /> <source>No differences available. Get some more log entries.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2796" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2810" /> <source>No differences available.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2807" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2821" /> <source>Differences to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2823" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2837" /> <source>Diff to Parent {0}{1}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2846" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2860" /> <source>There is no difference.</source> <translation type="unfinished">Non ci sono differenze.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2999" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2983" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2965" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3013" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2997" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2979" /> <source>Save Diff</source> <translation type="unfinished">Salva Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2967" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2981" /> <source>Patch Files (*.diff)</source> <translation type="unfinished">File Patch (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2984" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2998" /> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"><p>Il file patch <b>{0}</b> esiste già.Sovrascriverlo ?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3000" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3014" /> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation type="unfinished"><p>Il file <b>{0}</b> non può essere salvato.<br />Motivo: {1}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3031" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3045" /> <source>closed</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3032" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3046" /> <source>inactive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3041" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3055" /> <source>{0} ({1})</source> <translation type="unfinished">{0} ({1})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3050" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3064" /> <source>Select the branches to be shown (none for 'All'):</source> <translation type="unfinished" /> </message> @@ -38614,6 +38804,10 @@ <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation><b>Log errori Mercurial</b><p>Mostra gli eventuali messaggi di errore del comando hg log.</p></translation> </message> + <message> + <source>Pull changes from a remote repository</source> + <translation type="vanished">Pull changes da un repository remoto</translation> + </message> </context> <context> <name>HgMergeDialog</name> @@ -38979,208 +39173,213 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="282" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="309" /> + <source>Other Functions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="335" /> <source>Extensions</source> <translation>Estensioni</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="718" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="604" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="556" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="451" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="308" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="774" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="659" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="611" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="505" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="361" /> <source>Version Control</source> <translation>Controllo di Versione</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="734" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="620" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="467" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="324" /> - <source>Commit changes to repository...</source> - <translation>Committa le modifica nel repository...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="742" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="628" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="475" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="332" /> - <source>Add to repository</source> - <translation>Aggiungi al repository</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="748" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="481" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="338" /> - <source>Remove from repository (and disk)</source> - <translation>Rimuovi dal repository (e dal disco)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1012" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="999" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="487" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="344" /> - <source>Remove from repository only</source> - <translation>Rimuovi solo dal repository</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="639" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="349" /> - <source>Copy</source> - <translation>Copia</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="641" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="351" /> - <source>Move</source> - <translation>Sposta</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="646" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="356" /> - <source>Show log browser</source> - <translation>Mostra il browser dei log</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="755" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="653" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="494" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="363" /> - <source>Show status</source> - <translation>Mostra stato</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="762" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="660" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="501" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="370" /> - <source>Show differences</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="376" /> - <source>Show differences side-by-side</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="768" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="666" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="507" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="382" /> - <source>Show differences (extended)</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="388" /> - <source>Show differences side-by-side (extended)</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="394" /> - <source>Show annotated file</source> - <translation>Mostra file appuntati</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="398" /> - <source>Show annotated file with skip list</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="402" /> - <source>Create skip list file</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="775" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="673" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="514" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="408" /> - <source>Revert changes</source> - <translation>Annulla modifiche</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="779" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="677" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="518" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="412" /> - <source>Conflicts resolved</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="781" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="679" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="520" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="414" /> - <source>Conflicts unresolved</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="783" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="681" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="522" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="416" /> - <source>Re-Merge</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="787" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="685" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="571" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="526" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="420" /> - <source>Select all local file entries</source> - <translation>Seleziona tutt i file locali</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="790" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="688" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="574" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="529" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="423" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="675" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="521" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="377" /> + <source>Commit changes to repository...</source> + <translation>Committa le modifica nel repository...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="799" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="684" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="530" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="386" /> + <source>Add to repository</source> + <translation>Aggiungi al repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="805" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="690" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="536" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="392" /> + <source>Remove from repository (and disk)</source> + <translation>Rimuovi dal repository (e dal disco)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1069" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1056" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="542" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="398" /> + <source>Remove from repository only</source> + <translation>Rimuovi solo dal repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="695" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="403" /> + <source>Copy</source> + <translation>Copia</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="697" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="405" /> + <source>Move</source> + <translation>Sposta</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="702" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="410" /> + <source>Show log browser</source> + <translation>Mostra il browser dei log</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="812" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="709" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="549" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="417" /> + <source>Show status</source> + <translation>Mostra stato</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="819" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="716" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="556" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="424" /> + <source>Show differences</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="430" /> + <source>Show differences side-by-side</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="825" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="722" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="562" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="436" /> + <source>Show differences (extended)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="442" /> + <source>Show differences side-by-side (extended)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="448" /> + <source>Show annotated file</source> + <translation>Mostra file appuntati</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="452" /> + <source>Show annotated file with skip list</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="456" /> + <source>Create skip list file</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="832" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="729" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="569" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="462" /> + <source>Revert changes</source> + <translation>Annulla modifiche</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="836" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="733" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="573" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="466" /> + <source>Conflicts resolved</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="735" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="575" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="468" /> + <source>Conflicts unresolved</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="840" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="737" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="577" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="470" /> + <source>Re-Merge</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="844" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="741" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="581" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="474" /> + <source>Select all local file entries</source> + <translation>Seleziona tutt i file locali</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="847" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="744" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="629" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="584" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="477" /> <source>Select all versioned file entries</source> <translation>Seleziona tutti i file controllati</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="793" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="691" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="577" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="532" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="426" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="850" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="747" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="632" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="587" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="480" /> <source>Select all local directory entries</source> <translation>Seleziona tutte le directory locali</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="797" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="695" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="581" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="536" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="430" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="854" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="751" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="591" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="484" /> <source>Select all versioned directory entries</source> <translation>Seleziona tutte le directory controllate</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="801" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="699" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="585" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="540" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="434" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="858" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="755" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="640" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="595" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="488" /> <source>Configure...</source> <translation type="unfinished">Configura...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="916" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="973" /> <source>Create {0} file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="917" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="974" /> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished"><p>Il file <b>{0}</b> esiste già. Sovrascriverlo ?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1013" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1000" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1070" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1057" /> <source>Do you really want to remove these files from the repository?</source> <translation>Vuoi veramente rimuovere questi file dal repository ?</translation> </message> @@ -39188,1513 +39387,1518 @@ <context> <name>HgProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="126" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="135" /> <source>New from repository</source> <translation>Nuovo dal repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="128" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="137" /> <source>&New from repository...</source> <translation>&Nuovo dal repository...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="135" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="144" /> <source>Create (clone) a new project from a Mercurial repository</source> <translation>Crea (clone) un nuovo progetto da un repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="138" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="147" /> <source><b>New from repository</b><p>This creates (clones) a new local project from a Mercurial repository.</p></source> <translation><b>Nuovo dal repository</b><p>Crea (clone) un nuovo progetto locale da un repository Mercurial.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="150" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="148" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="159" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="157" /> <source>Show incoming log</source> <translation>Mostra log in ingresso</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="156" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="165" /> <source>Show the log of incoming changes</source> <translation>Mostra il log delle modifiche in ingresso</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="158" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="167" /> <source><b>Show incoming log</b><p>This shows the log of changes coming into the repository.</p></source> <translation><b>Mostra log in ingresso</b><p>Mostra il log delle modifiche che entrano nel repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="170" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="168" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="179" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="177" /> <source>Pull changes</source> <translation>Pull modifiche</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="176" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="185" /> <source>Pull changes from a remote repository</source> <translation>Pull changes da un repository remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="178" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="187" /> <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository.</p></source> <translation><b>Pull modifiche</b><p>Scarica le modifiche da un repository remoto a quello locale.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="188" /> - <source>Update from repository</source> - <translation>Aggiorna da repository</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="190" /> - <source>&Update from repository</source> - <translation>&Aggiorna da repository</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="197" /> + <source>Update from repository</source> + <translation>Aggiorna da repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="199" /> + <source>&Update from repository</source> + <translation>&Aggiorna da repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="206" /> <source>Update the local project from the Mercurial repository</source> <translation>Aggiorna il progetto locate da un repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="200" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="209" /> <source><b>Update from repository</b><p>This updates the local project from the Mercurial repository.</p></source> <translation><b>Aggiorna dal repository</b><p>Aggiorna il progetto locale da un repository Mercurial.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="210" /> - <source>Commit changes to repository</source> - <translation>Committa le modifica nel repository</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="212" /> - <source>&Commit changes to repository...</source> - <translation>&Committa le modifica nel repository...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="219" /> + <source>Commit changes to repository</source> + <translation>Committa le modifica nel repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="221" /> + <source>&Commit changes to repository...</source> + <translation>&Committa le modifica nel repository...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="228" /> <source>Commit changes to the local project to the Mercurial repository</source> <translation>Committa le modifiche al progetto locale nel repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="231" /> <source><b>Commit changes to repository</b><p>This commits changes to the local project to the Mercurial repository.</p></source> <translation><b>Committa modifiche al repository</b><p>Committa le modifiche al progetto locale nel repository Mercurial.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="234" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="232" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="243" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="241" /> <source>Show outgoing log</source> <translation>Mostra log in uscita</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="240" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="249" /> <source>Show the log of outgoing changes</source> <translation>Mostra il log della modifiche in uscita</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="242" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251" /> <source><b>Show outgoing log</b><p>This shows the log of changes outgoing out of the repository.</p></source> <translation><b>Mostra log in uscita</b><p>Mostra il log della modifiche che escono dal repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="254" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="252" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261" /> <source>Push changes</source> <translation>Push modifiche</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="260" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="269" /> <source>Push changes to a remote repository</source> <translation>Push modifiche ad un repository remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="262" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271" /> <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> <translation><b>Push delle modifiche</b><p>Push delle modifiche dal repository locale a quello remoto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="274" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="272" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281" /> <source>Push changes (force)</source> <translation>Push delle modifiche (forza)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="290" /> <source>Push changes to a remote repository with force option</source> <translation>Push delle modifiche verso un repository remoto con l'opzione force</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="284" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293" /> <source><b>Push changes (force)</b><p>This pushes changes from the local repository to a remote repository using the 'force' option.</p></source> <translation><b>Push modifiche (force)</b><p>Esegue il push delle modifche dal repository locale verso uno remoto usando l'opzione 'force'.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="294" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="303" /> <source>Export from repository</source> <translation>Esporta dal repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="296" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="305" /> <source>&Export from repository...</source> <translation>&Esporta dal repository...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="302" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="311" /> <source>Export a project from the repository</source> <translation>Esporta il progetto dal repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="313" /> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation><b>Esporta dal repository</b><p>Esporta un progetto dal repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="313" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="324" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322" /> <source>Show log browser</source> <translation>Mostra il browser dei log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="331" /> <source>Show a dialog to browse the log of the local project</source> <translation>Mostra un dialogo per navigare i log del progetto locale</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="334" /> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation><b>Mostra borwser log</b><p>Mostra un dialogo per navigare i log del progetto locale. Inizialmente viene mostrato un numero limitato di elementi. Altri possono essere scaricati in seguito.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="336" /> - <source>Show differences</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="338" /> - <source>Show &difference</source> - <translation>Mostra &differenza</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="345" /> + <source>Show differences</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347" /> + <source>Show &difference</source> + <translation>Mostra &differenza</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="354" /> <source>Show the difference of the local project to the repository</source> <translation>Mostra le differenze tra il progetto locale e il repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="357" /> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="360" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="358" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="369" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="367" /> <source>Show differences (extended)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="367" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376" /> <source>Show the difference of revisions of the project to the repository</source> <translation>Mostra le differenze tra la revisione del progetto e il repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="370" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379" /> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="380" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389" /> <source>Show status</source> <translation>Mostra stato</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="391" /> <source>Show &status...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="397" /> <source>Show the status of the local project</source> <translation>Mostra lo stato del progetto locale</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390" /> - <source><b>Show status</b><p>This shows the status of the local project.</p></source> - <translation><b>Mostra stato</b><p>Mostra lo stato del progetto locale.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="399" /> - <source>Show Summary</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="401" /> - <source>Show summary...</source> - <translation type="unfinished" /> + <source><b>Show status</b><p>This shows the status of the local project.</p></source> + <translation><b>Mostra stato</b><p>Mostra lo stato del progetto locale.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408" /> + <source>Show Summary</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="410" /> + <source>Show summary...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="417" /> <source>Show summary information of the working directory status</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="411" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420" /> <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="430" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="430" /> <source>Show heads</source> <translation>Mostra head</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="432" /> <source>Show the heads of the repository</source> <translation>Mostra head del repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="425" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="434" /> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation><b>Mostra head</b><p>Mostra l'head del repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="434" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="443" /> <source>Show parents</source> <translation>Mostra predecessori</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="441" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450" /> <source>Show the parents of the repository</source> <translation>Mostra il predecessori del repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="443" /> - <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> - <translation><b>Mostra predecessori</b><p>Mostra i predecessori del repository.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="452" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="452" /> + <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> + <translation><b>Mostra predecessori</b><p>Mostra i predecessori del repository.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461" /> <source>Show tip</source> <translation>Mostra tip</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="463" /> <source>Show the tip of the repository</source> <translation>Mostra il tip del repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="456" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="465" /> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation><b>Mostra tip</b><p>Mostra il tip del repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462" /> - <source>Revert changes</source> - <translation>Annulla modifiche</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464" /> - <source>Re&vert changes</source> - <translation>In&verti modifiche</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471" /> + <source>Revert changes</source> + <translation>Annulla modifiche</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="473" /> + <source>Re&vert changes</source> + <translation>In&verti modifiche</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="480" /> <source>Revert all changes made to the local project</source> <translation>Inverti tutte le modifiche fatte al progetto locale</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483" /> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation><b>Inverti modifiche</b><p>Inverte tutte le modifiche fatte al progetto locale.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2110" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2129" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492" /> <source>Merge</source> <translation>Fondi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="485" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494" /> <source>Mer&ge changes...</source> <translation>Fon&di modifiche...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501" /> <source>Merge changes of a revision into the local project</source> <translation>Fondi le modifiche dela revisione nel progetto locale</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="495" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="504" /> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation><b>Merge</b><p>Fonde le modifiche della revisione nel progetto locale.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="506" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505" /> - <source>Commit Merge</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512" /> - <source>Commit all the merged changes.</source> - <translation type="unfinished" /> - </message> - <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="515" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514" /> - <source><b>Commit a merge</b><p>This commits a merge working directory</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524" /> + <source>Commit Merge</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521" /> + <source>Commit all the merged changes.</source> + <translation type="unfinished" /> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="523" /> + <source><b>Commit a merge</b><p>This commits a merge working directory</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="533" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="532" /> <source>Abort Merge</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="531" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540" /> <source>Abort an uncommitted merge and lose all changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="543" /> <source><b>Abort uncommitted merge</b><p>This aborts an uncommitted merge causing all changes to be lost.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="546" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="544" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="553" /> <source>Re-Merge</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="553" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="562" /> <source>Re-Merge all conflicting, unresolved files of the project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="556" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="565" /> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="575" /> <source>Show conflicts</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="576" /> <source>Show conflicts...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="583" /> <source>Show a dialog listing all files with conflicts</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586" /> <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596" /> <source>Conflicts resolved</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="597" /> <source>Con&flicts resolved</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604" /> <source>Mark all conflicts of the local project as resolved</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="607" /> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617" /> <source>Conflicts unresolved</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625" /> <source>Mark all conflicts of the local project as unresolved</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628" /> <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638" /> <source>Tag in repository</source> <translation>Tag nel repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640" /> <source>&Tag in repository...</source> <translation>&Tag nel repository...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="637" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646" /> <source>Tag the local project in the repository</source> <translation>Tag del progetto locale nel repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="639" /> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation><b>Tag nel repository</b><p>Tag del progetto locale nel repository.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648" /> - <source>List tags</source> - <translation>Elenca tag</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="649" /> - <source>List tags...</source> - <translation>Elenca tag...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655" /> - <source>List tags of the project</source> - <translation>Elenca i tag del progetto</translation> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation><b>Tag nel repository</b><p>Tag del progetto locale nel repository.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657" /> - <source><b>List tags</b><p>This lists the tags of the project.</p></source> - <translation><b>Elenca tag</b><p>Elenca i tag del progetto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663" /> - <source>List branches</source> - <translation>Elenca branches</translation> + <source>List tags</source> + <translation>Elenca tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="658" /> + <source>List tags...</source> + <translation>Elenca tag...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="664" /> - <source>List branches...</source> - <translation>Elenca branches...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670" /> - <source>List branches of the project</source> - <translation>Elenca i branches del progetto</translation> + <source>List tags of the project</source> + <translation>Elenca i tag del progetto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666" /> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <translation><b>Elenca tag</b><p>Elenca i tag del progetto.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672" /> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation><b>Elenca branches</b><p>Elenca i branch del progetto.</p></translation> + <source>List branches</source> + <translation>Elenca branches</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673" /> + <source>List branches...</source> + <translation>Elenca branches...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="679" /> + <source>List branches of the project</source> + <translation>Elenca i branches del progetto</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681" /> - <source>Create branch</source> - <translation>Crea Branch</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="683" /> - <source>Create &branch...</source> - <translation>Crea &Branch...</translation> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation><b>Elenca branches</b><p>Elenca i branch del progetto.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="690" /> + <source>Create branch</source> + <translation>Crea Branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692" /> + <source>Create &branch...</source> + <translation>Crea &Branch...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699" /> <source>Create a new branch for the local project in the repository</source> <translation>Crea un nuovo branch per il progetto locale nel repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="693" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="702" /> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation><b>Crea Branch</b><p>Crea un nuovo branch per il progetto locate nel repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712" /> <source>Push new branch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721" /> <source>Push the current branch of the local project as a new named branch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="717" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726" /> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="738" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736" /> <source>Close branch</source> <translation>Chiudi branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="745" /> <source>Close the current branch of the local project</source> <translation>Chiudi il branch corrente del progetto locale</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748" /> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation><b>Chiudi branch</b><p>Chiude il branch corrente del progetto locale.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="758" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757" /> <source>Show current branch</source> <translation>Mostra branch corrente</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="756" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765" /> <source>Show the current branch of the project</source> <translation>Mostra il brach corrente del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="759" /> - <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> - <translation><b>Mostra il branch corrente</b><p>Mostra il branch corrente del progetto.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768" /> - <source>Switch</source> - <translation>Switch</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770" /> - <source>S&witch...</source> - <translation>S&witch...</translation> + <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> + <translation><b>Mostra il branch corrente</b><p>Mostra il branch corrente del progetto.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777" /> + <source>Switch</source> + <translation>Switch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="779" /> + <source>S&witch...</source> + <translation>S&witch...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786" /> <source>Switch the working directory to another revision</source> <translation>Switch della directory di lavoro ad un'altra revisione</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="780" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="789" /> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation><b>Switch</b><p>Switch della directory di lavoro ad un'altra revisione.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799" /> <source>Cleanup</source> <translation>Pulisci</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799" /> <source>Cleanu&p</source> <translation>&Pulisci</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="792" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801" /> <source>Cleanup the local project</source> <translation>Pulisci il progetto locale</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794" /> - <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> - <translation><b>Pulizia</b><p>Esegue la pulizia del progetto locale.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="803" /> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation><b>Pulizia</b><p>Esegue la pulizia del progetto locale.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="812" /> <source>Execute command</source> <translation>Esegui comando</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813" /> <source>E&xecute command...</source> <translation>&Esegui comando...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="811" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="820" /> <source>Execute an arbitrary Mercurial command</source> <translation>Esegui un comando Mercurial arbitrario</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="814" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="823" /> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation><b>Esegui comando</b><p>Apre un dialogo per inserire un comando Mercurial arbitraio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="824" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833" /> <source>Configure</source> <translation>Configura</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="834" /> <source>Configure...</source> <translation>Configura...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="841" /> <source>Show the configuration dialog with the Mercurial page selected</source> <translation>Mostra il dialogo di configurazione con la pagina di Mercurial selezionata</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="835" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="844" /> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation><b>Configura</b><p>Mostra il dialogo di configurazione con la pagina di Mercurial selezionata.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854" /> <source>Edit user configuration</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855" /> <source>Edit user configuration...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="862" /> <source>Show an editor to edit the user configuration file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="856" /> - <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865" /> + <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874" /> <source>Edit repository configuration</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875" /> <source>Edit repository configuration...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="873" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882" /> <source>Show an editor to edit the repository configuration file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="876" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885" /> <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895" /> <source>Show combined configuration settings</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896" /> <source>Show combined configuration settings...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="894" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903" /> <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909" /> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919" /> <source>Show paths</source> <translation>Mostra percorsi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="911" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="920" /> <source>Show paths...</source> <translation>Mostra percorsi...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="918" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="927" /> <source>Show the aliases for remote repositories</source> <translation>Mostra alias per i repository remoti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="921" /> - <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> - <translation><b>Mostra percorsi</b><p>Mostra alias per i repository remoti.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930" /> - <source>Verify repository</source> - <translation>Verifica repository</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="931" /> - <source>Verify repository...</source> - <translation>Verifica repository...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937" /> - <source>Verify the integrity of the repository</source> - <translation>Verifica l'integrità del repository</translation> + <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> + <translation><b>Mostra percorsi</b><p>Mostra alias per i repository remoti.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="939" /> - <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> - <translation><b>Verifica repository</b><p>Verifica l'integrità del repository.</p></translation> + <source>Verify repository</source> + <translation>Verifica repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="940" /> + <source>Verify repository...</source> + <translation>Verifica repository...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="946" /> + <source>Verify the integrity of the repository</source> + <translation>Verifica l'integrità del repository</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="948" /> + <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> + <translation><b>Verifica repository</b><p>Verifica l'integrità del repository.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="957" /> <source>Recover</source> <translation>Recover</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="948" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="957" /> <source>Recover...</source> <translation>Recover...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="951" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960" /> <source>Recover from an interrupted transaction</source> <translation>Recupera da una transazione interrotta</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="954" /> - <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> - <translation><b>Recover</b><p>Recupera da una transazione interrotta.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="963" /> - <source>Identify</source> - <translation>Identify</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964" /> - <source>Identify...</source> - <translation>Identify...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="970" /> - <source>Identify the project directory</source> - <translation>Identifica la directory del progetto</translation> + <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> + <translation><b>Recover</b><p>Recupera da una transazione interrotta.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="972" /> + <source>Identify</source> + <translation>Identify</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973" /> + <source>Identify...</source> + <translation>Identify...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979" /> + <source>Identify the project directory</source> + <translation>Identifica la directory del progetto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="981" /> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation><b>Identify</b><p>Identifica la directory del progetto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="981" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="990" /> <source>Create .hgignore</source> <translation>Crea .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="989" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="998" /> <source>Create a .hgignore file with default values</source> <translation>Crea una file .hgignore con i valori di default</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="992" /> - <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> - <translation><b>Crea .hgignore</b><p>Crea una file .hgignore con i valori di default.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001" /> - <source>Create changegroup</source> - <translation>Crea changegroup</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1003" /> - <source>Create changegroup...</source> - <translation>Crea changegroup...</translation> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> + <translation><b>Crea .hgignore</b><p>Crea una file .hgignore con i valori di default.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010" /> + <source>Create changegroup</source> + <translation>Crea changegroup</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1012" /> + <source>Create changegroup...</source> + <translation>Crea changegroup...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1019" /> <source>Create changegroup file collecting changesets</source> <translation>Crea un file changegroup che colleziona i changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1013" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1022" /> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation><b>Crea changegroup</b><p>Crea un file changegroup che colleziona i changeset (hg bundle).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1023" /> - <source>Preview changegroup</source> - <translation>Anteprima changegroup</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1025" /> - <source>Preview changegroup...</source> - <translation>Anteprima changegroup...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032" /> + <source>Preview changegroup</source> + <translation>Anteprima changegroup</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1034" /> + <source>Preview changegroup...</source> + <translation>Anteprima changegroup...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041" /> <source>Preview a changegroup file containing a collection of changesets</source> <translation>Anteprima di un file changegroup contenente una collezione di changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044" /> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation><b>Anteprima changegroup</b><p>Anteprima di un file changegroup contenente una collezione di changeset.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2244" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1045" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2263" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054" /> <source>Apply changegroups</source> <translation>Applica changegroups</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1047" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056" /> <source>Apply changegroups...</source> <translation>Applica changegroups...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063" /> <source>Apply one or several changegroup files</source> <translation>Applica una o più file changegroups</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066" /> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation><b>Applica changegroups</b><p>Applica una o più file changegroups generati dall'azione Create changegroup' action (hg unbundle).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1067" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076" /> <source>Mark as "good"</source> <translation>Segna come "good"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1077" /> <source>Mark as "good"...</source> <translation>Segna come "good"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1075" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1084" /> <source>Mark a selectable changeset as good</source> <translation>Segna un chageset selezionabile come good</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1078" /> - <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> - <translation><b>Segna come "good"</b><p>Segna un chageset selezionabile come good.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1087" /> - <source>Mark as "bad"</source> - <translation>Segna come "bad"</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088" /> - <source>Mark as "bad"...</source> - <translation>Segna come "bad"...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1094" /> - <source>Mark a selectable changeset as bad</source> - <translation>Segna un chageset selezionabile come bad</translation> + <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> + <translation><b>Segna come "good"</b><p>Segna un chageset selezionabile come good.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1096" /> - <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> - <translation><b>Segna come bad</b><p>Segna un chageset selezionabile come bad.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105" /> - <source>Skip</source> - <translation>Salta</translation> + <source>Mark as "bad"</source> + <translation>Segna come "bad"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1097" /> + <source>Mark as "bad"...</source> + <translation>Segna come "bad"...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103" /> + <source>Mark a selectable changeset as bad</source> + <translation>Segna un chageset selezionabile come bad</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105" /> + <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> + <translation><b>Segna come bad</b><p>Segna un chageset selezionabile come bad.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1114" /> + <source>Skip</source> + <translation>Salta</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1114" /> <source>Skip...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1107" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116" /> <source>Skip a selectable changeset</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1109" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118" /> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1115" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1115" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124" /> <source>Reset</source> <translation>Resetta</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1117" /> - <source>Reset the bisect search data</source> - <translation>Reset dei dati di ricerca bisect</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119" /> - <source><b>Reset</b><p>This resets the bisect search data.</p></source> - <translation><b>Reset</b><p>Reset dei dati di ricerca bisect.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1126" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1125" /> + <source>Reset the bisect search data</source> + <translation>Reset dei dati di ricerca bisect</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128" /> + <source><b>Reset</b><p>This resets the bisect search data.</p></source> + <translation><b>Reset</b><p>Reset dei dati di ricerca bisect.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1135" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134" /> <source>Back out changeset</source> <translation>Ritiro changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1142" /> <source>Back out changes of an earlier changeset</source> <translation>Ritiro changeset di un changeset precedente</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1145" /> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation></b>Ritiro changeset</b><p>Ritiro changeset di un changeset precedente.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1145" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1155" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154" /> <source>Rollback last transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1152" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161" /> <source>Rollback the last transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1163" /> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1176" /> - <source>Serve project repository</source> - <translation>Servi repository del progetto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1177" /> - <source>Serve project repository...</source> - <translation>Servi repository del progetto...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183" /> - <source>Serve the project repository</source> - <translation>Servi il repository del progetto</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185" /> + <source>Serve project repository</source> + <translation>Servi repository del progetto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1186" /> + <source>Serve project repository...</source> + <translation>Servi repository del progetto...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1192" /> + <source>Serve the project repository</source> + <translation>Servi il repository del progetto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1194" /> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation><b>Servi repository del progetto</b><p>Rende disponibile il repository del progetto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2301" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1194" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1203" /> <source>Import Patch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1196" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1205" /> <source>Import Patch...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1202" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211" /> <source>Import a patch from a patch file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1204" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1213" /> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1214" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1223" /> <source>Export Patches</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1225" /> <source>Export Patches...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1222" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1231" /> <source>Export revisions to patch files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1224" /> - <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233" /> - <source>Change Phase</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234" /> - <source>Change Phase...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1240" /> - <source>Change the phase of revisions</source> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1242" /> + <source>Change Phase</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1243" /> + <source>Change Phase...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1249" /> + <source>Change the phase of revisions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251" /> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2343" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1804" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1253" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2362" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1822" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1262" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1260" /> <source>Copy Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1259" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1268" /> <source>Copies changesets from another branch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1261" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270" /> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1273" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1272" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1282" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1281" /> <source>Continue Copying Session</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1280" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1289" /> <source>Continue the last copying session after conflicts were resolved</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1283" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1292" /> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1294" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1293" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1303" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1302" /> <source>Stop Copying Session</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1310" /> <source>Stop the interrupted copying session</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1304" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1313" /> <source><b>Stop Copying Session</b><p>This stops the interrupted copying session.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1314" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1313" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1323" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1322" /> <source>Abort Copying Session</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1321" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330" /> <source>Abort the interrupted copying session and rollback</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1324" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1333" /> <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1334" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1343" /> <source>Add</source> <translation type="unfinished">Aggiungi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1336" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1345" /> <source>Add...</source> <translation type="unfinished">Aggiungi...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1342" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1351" /> <source>Add a sub-repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1344" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1353" /> <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1350" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1359" /> <source>Remove</source> <translation type="unfinished">Rimuovi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1352" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1361" /> <source>Remove...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1358" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367" /> <source>Remove sub-repositories</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1360" /> - <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1369" /> - <source>Create unversioned archive</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1371" /> - <source>Create unversioned archive...</source> + <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1378" /> + <source>Create unversioned archive</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1380" /> + <source>Create unversioned archive...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1387" /> <source>Create an unversioned archive from the repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1381" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1390" /> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1391" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1400" /> <source>List bookmarks</source> <translation type="unfinished">Lista i segnalibri</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1393" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1402" /> <source>List bookmarks...</source> <translation type="unfinished">Lista i segnalibri...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1399" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1408" /> <source>List bookmarks of the project</source> <translation type="unfinished">Lista i segnalibri del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1401" /> - <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> - <translation type="unfinished"><b>Lista i segnalibri</b><p>Lista i segnalibri del progetto.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1410" /> - <source>Define bookmark</source> - <translation type="unfinished">Definisci un segnalibro</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1412" /> - <source>Define bookmark...</source> - <translation type="unfinished">Definisci un segnalibro...</translation> + <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> + <translation type="unfinished"><b>Lista i segnalibri</b><p>Lista i segnalibri del progetto.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1419" /> + <source>Define bookmark</source> + <translation type="unfinished">Definisci un segnalibro</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1421" /> + <source>Define bookmark...</source> + <translation type="unfinished">Definisci un segnalibro...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1428" /> <source>Define a bookmark for the project</source> <translation type="unfinished">Definisci un segnalibro per il progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1422" /> - <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> - <translation type="unfinished"><b>Definisci un segnalibro</b><p>Definisci un segnalibro per il progetto.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1431" /> - <source>Delete bookmark</source> - <translation type="unfinished">Cancella segnalibro</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1433" /> - <source>Delete bookmark...</source> - <translation type="unfinished">Cancella segnalibro...</translation> + <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> + <translation type="unfinished"><b>Definisci un segnalibro</b><p>Definisci un segnalibro per il progetto.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1440" /> + <source>Delete bookmark</source> + <translation type="unfinished">Cancella segnalibro</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1442" /> + <source>Delete bookmark...</source> + <translation type="unfinished">Cancella segnalibro...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1449" /> <source>Delete a bookmark of the project</source> <translation type="unfinished">Cancella un segnalibro del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1443" /> - <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> - <translation type="unfinished"><b>Cancella segnalibro</b><p>Cancella un segnalibro del progetto.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1452" /> - <source>Rename bookmark</source> - <translation type="unfinished">Rinomina segnalibro</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1454" /> - <source>Rename bookmark...</source> - <translation type="unfinished">Rinomina segnalibro...</translation> + <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> + <translation type="unfinished"><b>Cancella segnalibro</b><p>Cancella un segnalibro del progetto.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1461" /> + <source>Rename bookmark</source> + <translation type="unfinished">Rinomina segnalibro</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1463" /> + <source>Rename bookmark...</source> + <translation type="unfinished">Rinomina segnalibro...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1470" /> <source>Rename a bookmark of the project</source> <translation type="unfinished">Rinomina un segnalibro del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1464" /> - <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> - <translation type="unfinished"><b>Rinomina segnalibro</b><p>Rinomina un segnalibro del progetto.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1473" /> + <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> + <translation type="unfinished"><b>Rinomina segnalibro</b><p>Rinomina un segnalibro del progetto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1482" /> <source>Move bookmark</source> <translation type="unfinished">Sposta segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1475" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1484" /> <source>Move bookmark...</source> <translation type="unfinished">Sposta segnalibro...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1481" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1490" /> <source>Move a bookmark of the project</source> <translation type="unfinished">Sposta un segnalibro del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1483" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1492" /> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation type="unfinished"><b>Sposta segnalibro</b><p>Sposta un segnalibro del progetto ad un altro insieme di modifiche.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1495" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1493" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1504" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1502" /> <source>Show incoming bookmarks</source> <translation type="unfinished">Mostra i segnalibri entranti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1502" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1511" /> <source>Show a list of incoming bookmarks</source> <translation type="unfinished">Mostra una lista dei segnalibri entranti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1505" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1514" /> <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> <translation type="unfinished"><b>Mostra segnalibri entranti</b><p>Mostra una lista di nuovi segnalibri disponibili nel repository remoto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1517" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1515" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1526" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1524" /> <source>Pull bookmark</source> <translation type="unfinished">Estrae segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1524" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1533" /> <source>Pull a bookmark from a remote repository</source> <translation type="unfinished">Estrae un segnalibro da un repository remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1527" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1536" /> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"><b>Estrae segnalibri</b><p>Estrae un segnalibro da un repository remoto a quello locale.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1539" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1537" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1548" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1546" /> <source>Pull current bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1546" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1555" /> <source>Pull the current bookmark from a remote repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1549" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1558" /> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1560" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1558" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1569" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1567" /> <source>Show outgoing bookmarks</source> <translation type="unfinished">Mostra segnalibri uscenti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1567" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1576" /> <source>Show a list of outgoing bookmarks</source> <translation type="unfinished">Mostra una lista di segnalibri uscenti</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1570" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1579" /> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation type="unfinished"><b>Mostra segnalibri in uscita</b><p>Mostra una lista di nuovi segnalibri disponibili nel repository locale.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1582" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1580" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1591" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1589" /> <source>Push bookmark</source> <translation type="unfinished">Inserisci segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1589" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1598" /> <source>Push a bookmark to a remote repository</source> <translation type="unfinished">Inserisce segnalibro in repository remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1592" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1601" /> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"><b>Inserimento segnalibro</b><p>Inserisce un segnalibro dal repository locale a quello remoto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1604" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1602" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1613" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1611" /> <source>Push current bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1611" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1620" /> <source>Push the current bookmark to a remote repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1614" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1623" /> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1626" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1624" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1635" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1633" /> <source>Push all bookmarks</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1633" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1642" /> <source>Push all bookmarks to a remote repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1636" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1645" /> <source><b>Push all bookmarks</b><p>This pushes all bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1647" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1645" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1656" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1654" /> <source>Delete all backups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1654" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1663" /> <source>Delete all backup bundles stored in the backup area</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1657" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1666" /> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1699" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1708" /> <source>Administration</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1724" /> - <source>Specials</source> - <translation>Speciali</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1733" /> + <source>Specials</source> + <translation>Speciali</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1742" /> <source>Changegroup Management</source> <translation>Changegroup Management</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1740" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1749" /> <source>Patch Management</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1746" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1755" /> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1754" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1763" /> <source>Tags</source> <translation type="unfinished">Tags</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1761" /> - <source>Branches</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1770" /> + <source>Branches</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1779" /> <source>Bookmarks</source> <translation type="unfinished">Segnalibri</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1791" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1800" /> + <source>Other Functions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1809" /> <source>Extensions</source> <translation type="unfinished">Estensioni</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1813" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1831" /> <source>Sub-Repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1818" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1836" /> <source>Merge Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1903" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1901" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1922" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1920" /> <source>Mercurial</source> <translation type="unfinished">Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2054" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2073" /> <source>Pull</source> <translation>Pull</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2391" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2375" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2360" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2344" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2323" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2302" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2245" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2055" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2410" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2394" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2379" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2363" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2342" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2321" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2264" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2074" /> <source>The project should be reread. Do this now?</source> <translation>Il progetto deve essere riletto. Farlo ora ?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2322" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2341" /> <source>Revert Changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2359" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2378" /> <source>Copy Changesets (Continue)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2374" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2393" /> <source>Copy Changesets (Stop)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2390" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2409" /> <source>Copy Changesets (Abort)</source> <translation type="unfinished" /> </message> @@ -40702,7 +40906,7 @@ <context> <name>HgPurgeListDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/HgPurgeListDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/HgPurgeListDialog.ui" line="0" /> <source>Purge List</source> <translation>Pulisci Lista</translation> </message> @@ -41872,87 +42076,87 @@ <context> <name>HgShelveBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Mercurial Shelve Browser</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Name</source> <translation>Nome</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Age</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Message</source> <translation>Messaggio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Statistics</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>File</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Lines added</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Lines deleted</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Errors</source> <translation>Errori</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source><b>Mercurial shelve errors</b><p>This shows possible error messages of the hg shelve command.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="58" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="58" /> <source>&Refresh</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="60" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="60" /> <source>Press to refresh the list of shelves</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="69" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="69" /> <source>Restore selected shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="72" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="72" /> <source>Delete selected shelves</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="75" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="75" /> <source>Delete all shelves</source> <translation type="unfinished" /> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="290" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="290" /> <source>%n file(s) changed</source> <translation> <numerusform /> @@ -41960,7 +42164,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="292" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="292" /> <source>%n line(s) inserted</source> <translation> <numerusform /> @@ -41968,7 +42172,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="295" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="295" /> <source>%n line(s) deleted</source> <translation> <numerusform /> @@ -41979,57 +42183,57 @@ <context> <name>HgShelveDataDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Name:</source> <translation>Nome:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Enter a name for the shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Date, Time:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Enter the commit date and time for the shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>yyyy-MM-dd HH:mm</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Message:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Enter a message for the shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Mark new/missing files as added/removed</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Select to shelve, but keep the changes in the working directory</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Shelve, but keep changes</source> <translation type="unfinished" /> </message> @@ -42037,7 +42241,7 @@ <context> <name>HgShelvesSelectionDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelvesSelectionDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelvesSelectionDialog.ui" line="0" /> <source>Mercurial Shelve Selection</source> <translation>Selezione dei Mercurial Shelve</translation> </message> @@ -42341,124 +42545,64 @@ <context> <name>HgStripDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Strip Changesets</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>&Revision</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> <source>Select to specify a revision by number</source> - <translation type="unfinished">Seleziona per specificare una revisione con un numero</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Seleziona per specificare una revisione con un numero</translation> + </message> + <message> <source>Number</source> - <translation type="unfinished">Numero</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Numero</translation> + </message> + <message> <source>Enter a revision number</source> - <translation type="unfinished">Inserisci un numero di revisione</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Inserisci un numero di revisione</translation> + </message> + <message> <source>Select to specify a revision by changeset id</source> - <translation type="unfinished">Seleziona per specificare la revisione dall'id del changeset</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Seleziona per specificare la revisione dall'id del changeset</translation> + </message> + <message> <source>Id:</source> - <translation type="unfinished">Id:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Id:</translation> + </message> + <message> <source>Enter a changeset id</source> - <translation type="unfinished">Inserisci id del changeset</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Inserisci id del changeset</translation> + </message> + <message> <source>Select to specify a revision by a tag</source> - <translation type="unfinished">Seleziona per specificare una revisione con un tag</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Seleziona per specificare una revisione con un tag</translation> + </message> + <message> <source>Tag:</source> - <translation type="unfinished">Tag:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Tag:</translation> + </message> + <message> <source>Enter a tag name</source> - <translation type="unfinished">Inserisci il nome del tag</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Inserisci il nome del tag</translation> + </message> + <message> <source>Select to specify a revision by a branch</source> - <translation type="unfinished">Seleziona per specificare una revisione con un branch</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Seleziona per specificare una revisione con un branch</translation> + </message> + <message> <source>Branch:</source> - <translation type="unfinished">Branch:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Branch:</translation> + </message> + <message> <source>Enter a branch name</source> - <translation type="unfinished">Inserisci un nome di branch</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Inserisci un nome di branch</translation> + </message> + <message> <source>Expression:</source> - <translation type="unfinished">Espressione:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enter a revision set expression</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Espressione:</translation> + </message> + <message> <source>Bookmark:</source> - <translation type="unfinished">Segnalibro:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Segnalibro:</translation> + </message> + <message> <source>Enter a bookmark name</source> - <translation type="unfinished">Digita un nome per il segnalibro</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to enforce removal of changesets</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enforce Operation</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to not create backup bundles</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>No Backup</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to keep the current working directory state</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Keep Working Directory</source> - <translation type="unfinished" /> + <translation type="vanished">Digita un nome per il segnalibro</translation> </message> </context> <context> @@ -42966,29 +43110,124 @@ </message> </context> <context> + <name>HgUncommitDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Undo Local Commit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Commit Message</source> + <translation type="unfinished">Messaggio di commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Enter the log message.</source> + <translation type="unfinished">Inserisci messaggio di log.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source><b>Log Message</b> +<p>Enter the log message for the uncommit action.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Recent commit messages</source> + <translation type="unfinished">Messagi di commit recenti</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Select a recent commit message to use</source> + <translation type="unfinished">Seleziona un messaggio di commit recete da usare</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Select to allow an empty commit after undoing it.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Allow empty commit after undoing commit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Select to allow undoing the commit with outstanding changes.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Allow undoing commit with outstanding changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Author</source> + <translation type="unfinished">Autore</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Enter author name to override the configured user:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Enter an author name in order to override the configured one</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Select to give date and time information</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Date and Time</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Date/Time:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Enter the date and time to be used</source> + <translation type="unfinished" /> + </message> + <message> + <source><b>Log Message</b> +<p>Enter the log message for the commit action.</p></source> + <translation type="vanished"><b>Messaggio di log</b> +<p>Inserisci il messaggio di log per la commit.</p></translation> + </message> + </context> + <context> <name>HgUnshelveDataDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Mercurial Unshelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Name:</source> <translation type="unfinished">Nome:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Enter the name of the shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Select to keep the shelved change</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Keep shelved change</source> <translation type="unfinished" /> </message> @@ -43058,22 +43297,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> - <translation type="unfinished">GPG</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the histedit extension</source> + <source>Rebase</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Histedit</source> + <source>Select to activate the queues extension</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> + <source>Queues</source> <translation type="unfinished" /> </message> <message> @@ -43089,52 +43328,42 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the Purge 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>Purge</source> + <source>Histedit</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the queues extension</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Queues</source> + <source>Select to activate the GPG 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 type="unfinished" /> + <source>GPG</source> + <translation type="unfinished">GPG</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Rebase</source> + <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 shelve extension</source> + <source>Fastexport</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Shelve</source> + <source>Select to activate the uncommit extension</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the strip extension</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Strip</source> + <source>Uncommit</source> <translation type="unfinished" /> </message> <message> @@ -43354,32 +43583,32 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="527" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="474" /> <source>Delete Host Fingerprint</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="528" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="475" /> <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="644" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="591" /> <source>Delete Host Minimum Protocol</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="645" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="592" /> <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="708" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="655" /> <source>Edit User Configuration</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="709" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="656" /> <source>You will loose all changes made in this dialog. Shall the data be saved first?</source> <translation type="unfinished" /> </message> @@ -43458,17 +43687,17 @@ <context> <name>HgUtilities</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="130" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="132" /> <source>The hg process finished with the exit code {0}</source> <translation type="unfinished">Il processo hg è terminato con codice di uscita {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="134" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="136" /> <source>The hg process did not finish within 30s.</source> <translation type="unfinished">Il processo hg non è finito entro i 30s.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="138" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="140" /> <source>Could not start the hg executable.</source> <translation type="unfinished">Non posso avviare l'eseguibile hg.</translation> </message> @@ -50772,13 +51001,13 @@ <name>Lexers</name> <message> <location filename="../QScintilla/Lexers/__init__.py" line="412" /> - <location filename="../Preferences/__init__.py" line="599" /> + <location filename="../Preferences/__init__.py" line="598" /> <source>Python Files (*.py *.py3)</source> <translation type="unfinished">File Python (*.py *.py3)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="505" /> - <location filename="../Preferences/__init__.py" line="602" /> + <location filename="../Preferences/__init__.py" line="601" /> <source>Python3 Files (*.py)</source> <translation>Python3 Files (*.py)</translation> </message> @@ -52617,8 +52846,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> @@ -53977,7 +54206,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> @@ -60239,74 +60468,12 @@ </message> <message> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to install the selected package</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to install the selected package to the user site</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to show details for the selected entry</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Toggle to show or hide the search window</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Package</source> + <source>Press to refresh the lists</source> <translation type="unfinished" /> </message> <message> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Enter the search term for the package name</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Enter search term</source> - <translation type="unfinished">Inserisci termini di ricerca</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to start the search</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to search for more packages</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Version</source> - <translation type="unfinished">Versione</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Released</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Description</source> - <translation type="unfinished">Descrizione</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to refresh the lists</source> + <source>Press to install a package.</source> <translation type="unfinished" /> </message> <message> @@ -60326,6 +60493,17 @@ </message> <message> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Press to show details for the selected entry</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Press to remove leftovers of an upgrade or uninstall run.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> <source>Select to show only locally-installed packages</source> <translation type="unfinished" /> </message> @@ -60369,6 +60547,13 @@ <message> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Package</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> <source>Installed</source> <translation type="unfinished" /> </message> @@ -60463,319 +60648,337 @@ <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="199" /> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Search Package:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Enter package name to search for.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Press to open a web browser for searching.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="83" /> <source>pip Menu</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="233" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="113" /> <source>Author:</source> <translation type="unfinished">Autore:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="234" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="114" /> <source>Author Email:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="235" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="115" /> <source>Classifiers:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="236" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="116" /> <source>Entry Points:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="237" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="117" /> <source>Files:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="238" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="118" /> <source>Homepage:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="239" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="119" /> <source>Installer:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="240" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="120" /> <source>License:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="241" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="121" /> <source>Location:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="242" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="122" /> <source>Metadata Version:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="243" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="123" /> <source>Name:</source> <translation type="unfinished">Nome:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="244" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="124" /> <source>Project URLs:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="245" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="125" /> <source>Requires:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="246" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="126" /> <source>Required By:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="247" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="127" /> <source>Summary:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="248" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="128" /> <source>Version:</source> <translation type="unfinished">Versione:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="450" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="335" /> <source>Getting installed packages...</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="478" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="363" /> <source>Getting outdated packages...</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1231" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1051" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1038" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1002" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="735" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="729" /> + <source>Cleanup Environment</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="730" /> + <source>The environment cleanup was successful.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="736" /> + <source>Some leftover package directories could not been removed. Delete them manually.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="834" /> <source>Search PyPI</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1003" /> - <source><p>Received an error while searching for <b>{0}</b>.</p><p>Error: {1}</p></source> - <translation type="unfinished" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="835" /> + <source><p>No package details info for <b>{0}</b> available.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="854" /> + <source>Pip</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="856" /> + <source>Install Pip</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="859" /> + <source>Install Pip to User-Site</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="862" /> + <source>Repair Pip</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="869" /> + <source>Install</source> + <translation type="unfinished">Installa</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1048" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="871" /> + <source>Install Packages</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="874" /> + <source>Install Local Package</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="877" /> + <source>Re-Install Selected Packages</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="884" /> + <source>Requirements/Constraints</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="886" /> + <source>Install Requirements</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="889" /> + <source>Uninstall Requirements</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="892" /> + <source>Generate Requirements...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="896" /> + <source>Install from 'pyproject.toml'</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="900" /> + <source>Uninstall from 'pyproject.toml'</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="905" /> + <source>Generate Constraints...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="912" /> + <source>Cache</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="914" /> + <source>Show Cache Info...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="917" /> + <source>Show Cached Files...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="920" /> + <source>Remove Cached Files...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="923" /> + <source>Purge Cache...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="940" /> + <source>Show Licenses...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="944" /> + <source>Check Vulnerabilities</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="948" /> + <source>Update Vulnerability Database</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="952" /> + <source>Create SBOM file</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="959" /> + <source>Edit User Configuration...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="962" /> + <source>Edit Environment Configuration...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="967" /> + <source>Configure...</source> + <translation type="unfinished">Configura...</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1211" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1198" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1187" /> + <source>Edit Configuration</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1212" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1199" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1188" /> + <source>No valid configuration path determined. Aborting</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1421" /> + <source>{0} {1}</source> + <comment>package name, package version</comment> + <translation type="unfinished">{0} {1}</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1442" /> + <source>Affected Version:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1445" /> + <source>Advisory:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1580" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1555" /> + <source>unknown</source> + <translation type="unfinished">sconosciuto</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1577" /> + <source>any</source> + <translation type="unfinished" /> + </message> + <message> + <source>Enter search term</source> + <translation type="vanished">Inserisci termini di ricerca</translation> + </message> + <message> + <source>Version</source> + <translation type="vanished">Versione</translation> + </message> + <message> + <source>Description</source> + <translation type="vanished">Descrizione</translation> </message> <message numerus="yes"> - <location filename="../PipInterface/PipPackagesWidget.py" line="1018" /> <source>%n package(s) found.</source> - <translation type="unfinished"> + <translation type="vanished"> <numerusform /> <numerusform /> </translation> </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1025" /> - <source>Showing first {0} packages found.</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1044" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1039" /> - <source><p>There were no results for <b>{0}</b>.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1052" /> - <source><p>There were no more results for <b>{0}</b>.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1232" /> - <source><p>No package details info for <b>{0}</b> available.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1251" /> - <source>Pip</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1253" /> - <source>Install Pip</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1256" /> - <source>Install Pip to User-Site</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1259" /> - <source>Repair Pip</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1266" /> - <source>Install</source> - <translation type="unfinished">Installa</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1445" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1268" /> - <source>Install Packages</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1271" /> - <source>Install Local Package</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1274" /> - <source>Re-Install Selected Packages</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1281" /> - <source>Requirements/Constraints</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1283" /> - <source>Install Requirements</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1286" /> - <source>Uninstall Requirements</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1289" /> - <source>Generate Requirements...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1293" /> - <source>Install from 'pyproject.toml'</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1297" /> - <source>Uninstall from 'pyproject.toml'</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1302" /> - <source>Generate Constraints...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1309" /> - <source>Cache</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1311" /> - <source>Show Cache Info...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1314" /> - <source>Show Cached Files...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1317" /> - <source>Remove Cached Files...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1320" /> - <source>Purge Cache...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1337" /> - <source>Show Licenses...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1341" /> - <source>Check Vulnerabilities</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1345" /> - <source>Update Vulnerability Database</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1349" /> - <source>Create SBOM file</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1356" /> - <source>Edit User Configuration...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1359" /> - <source>Edit Environment Configuration...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1364" /> - <source>Configure...</source> - <translation type="unfinished">Configura...</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1608" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1595" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1584" /> - <source>Edit Configuration</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1609" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1596" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1585" /> - <source>No valid configuration path determined. Aborting</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1818" /> - <source>{0} {1}</source> - <comment>package name, package version</comment> - <translation type="unfinished">{0} {1}</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1839" /> - <source>Affected Version:</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1842" /> - <source>Advisory:</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1977" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1952" /> - <source>unknown</source> - <translation type="unfinished">sconosciuto</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1974" /> - <source>any</source> - <translation type="unfinished" /> - </message> </context> <context> <name>PipPackagesWindow</name> @@ -61612,64 +61815,69 @@ <name>PluginRepositoryWidget</name> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="124" /> - <source>Stable</source> - <translation>Stabile</translation> + <source>Obsolete</source> + <translation type="unfinished" /> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="125" /> - <source>Unstable</source> - <translation>Instabile</translation> + <source>Stable</source> + <translation>Stabile</translation> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="126" /> - <source>Obsolete</source> - <translation type="unfinished" /> + <source>Unknown</source> + <translation>Sconosciuto</translation> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="127" /> - <source>Unknown</source> - <translation>Sconosciuto</translation> - </message> - <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="179" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="139" /> - <source>Update</source> - <translation>Aggiorna</translation> + <source>Unstable</source> + <translation>Instabile</translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="128" /> + <source>Upgrade Available</source> + <translation type="unfinished" /> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="182" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="145" /> - <source>Download</source> - <translation>Download</translation> - </message> - <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="153" /> - <source>Download & Install</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="188" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="161" /> - <source>Cancel</source> - <translation>Cancella</translation> - </message> - <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="167" /> - <source>Install</source> - <translation type="unfinished">Installa</translation> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="142" /> + <source>Update</source> + <translation>Aggiorna</translation> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="185" /> - <source>Download && Install</source> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="148" /> + <source>Download</source> + <translation>Download</translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="156" /> + <source>Download & Install</source> <translation type="unfinished" /> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="191" /> - <source>Close && Install</source> - <translation>Chiudi && installa</translation> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="164" /> + <source>Cancel</source> + <translation>Cancella</translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="170" /> + <source>Install</source> + <translation type="unfinished">Installa</translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="188" /> + <source>Download && Install</source> + <translation type="unfinished" /> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="194" /> + <source>Close && Install</source> + <translation>Chiudi && installa</translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="197" /> <source>Close</source> <translation type="unfinished">Chiudi</translation> </message> @@ -61721,98 +61929,103 @@ <translation>Il plugin richiesto è stato scaricato.</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="603" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="591" /> <source>Plugins Repository URL Changed</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="604" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="592" /> <source>The URL of the Plugins Repository has changed. Select the "Update" button to get the new repository file.</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="613" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="601" /> <source>Read plugins repository file</source> <translation>Leggi il file repository del plugin</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="614" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="602" /> <source><p>The plugins repository file <b>{0}</b> could not be read. Select Update</p></source> <translation><p>I file repository del plugin<b>{0}</b> non può essere letto. Seleziona aggiorna.</p></translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="623" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="611" /> <source>No plugin repository file available. Select Update.</source> <translation>Nessun file per repository disponibile. Selezionare Aggiorna.</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="627" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="615" /> <source>New: <b>{0}</b></source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="629" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="617" /> <source>Local Updates: <b>{0}</b></source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="632" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="620" /> <source>Remote Updates: <b>{0}</b></source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="705" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="673" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="693" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="661" /> <source>Error downloading file</source> <translation>Errone nello scaricamento del file</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="706" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="674" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="694" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="662" /> <source><p>Could not download the requested file from {0}.</p><p>Error: {1}</p></source> <translation><p>Non posso scaricare il file richiesto da {0}</p><p>Errore: {1}</p></translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="677" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="665" /> <source>No connection to Internet.</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="849" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="810" /> <source>up-to-date</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="852" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="813" /> <source>new download available</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="856" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="818" /> <source>update installable</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="860" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="823" /> <source>updated download available</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="864" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="828" /> <source>error determining status</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1269" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1239" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1002" /> + <source>{0}. {1}</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1346" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1316" /> <source>Cleanup of Plugin Downloads</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1273" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1242" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1350" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1319" /> <source><p>The plugin download <b>{0}</b> could not be deleted.</p><p>Reason: {1}</p></source> <translation type="unfinished" /> </message> @@ -61820,17 +62033,17 @@ <context> <name>PluginRepositoryWindow</name> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1126" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1203" /> <source>Process Generation Error</source> <translation>Errore Generazione Processo</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1127" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1204" /> <source><p>Could not start the process.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Non posso avviare il processo.<br>Assicurarsi sia disponibile come <b>{0}</b>.</p></translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1131" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1208" /> <source>OK</source> <translation>OK</translation> </message> @@ -62207,18 +62420,18 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1908" /> + <location filename="../Preferences/__init__.py" line="1909" /> <source>Export Preferences</source> <translation>Esporta Preferenze</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1937" /> - <location filename="../Preferences/__init__.py" line="1910" /> + <location filename="../Preferences/__init__.py" line="1938" /> + <location filename="../Preferences/__init__.py" line="1911" /> <source>Properties File (*.ini);;All Files (*)</source> <translation>File proprietà (*.ini);;Tutti i file(*)</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1935" /> + <location filename="../Preferences/__init__.py" line="1936" /> <source>Import Preferences</source> <translation>Importa Preferenze</translation> </message> @@ -62780,79 +62993,79 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="273" /> + <location filename="../Preferences/ProgramsDialog.py" line="275" /> <source>PyPI Package Management</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="525" /> - <location filename="../Preferences/ProgramsDialog.py" line="522" /> - <location filename="../Preferences/ProgramsDialog.py" line="506" /> - <location filename="../Preferences/ProgramsDialog.py" line="376" /> - <location filename="../Preferences/ProgramsDialog.py" line="309" /> - <location filename="../Preferences/ProgramsDialog.py" line="292" /> + <location filename="../Preferences/ProgramsDialog.py" line="527" /> + <location filename="../Preferences/ProgramsDialog.py" line="524" /> + <location filename="../Preferences/ProgramsDialog.py" line="508" /> + <location filename="../Preferences/ProgramsDialog.py" line="378" /> + <location filename="../Preferences/ProgramsDialog.py" line="311" /> + <location filename="../Preferences/ProgramsDialog.py" line="294" /> <source>(unknown)</source> <translation>(sconosciuto)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="296" /> + <location filename="../Preferences/ProgramsDialog.py" line="298" /> <source>Spell Checker - PyEnchant</source> <translation>Correttore - PyEnchant</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="313" /> + <location filename="../Preferences/ProgramsDialog.py" line="315" /> <source>Source Highlighter - Pygments</source> <translation>Evidenziatore Sorgente - Pygments</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="320" /> + <location filename="../Preferences/ProgramsDialog.py" line="322" /> <source>MicroPython - MPY Cross Compiler</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="327" /> + <location filename="../Preferences/ProgramsDialog.py" line="329" /> <source>MicroPython - ESP Tool</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="338" /> + <location filename="../Preferences/ProgramsDialog.py" line="340" /> <source>MicroPython - PyBoard Flasher</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="348" /> + <location filename="../Preferences/ProgramsDialog.py" line="350" /> <source>MicroPython - STLink Info</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="358" /> + <location filename="../Preferences/ProgramsDialog.py" line="360" /> <source>MicroPython - STLink Flasher</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="380" /> + <location filename="../Preferences/ProgramsDialog.py" line="382" /> <source>Code Assistant - Jedi</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="460" /> + <location filename="../Preferences/ProgramsDialog.py" line="462" /> <source>(not configured)</source> <translation>(non configurato)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="495" /> + <location filename="../Preferences/ProgramsDialog.py" line="497" /> <source>(module not found)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="528" /> + <location filename="../Preferences/ProgramsDialog.py" line="530" /> <source>(not executable)</source> <translation>(non eseguibile)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="574" /> + <location filename="../Preferences/ProgramsDialog.py" line="576" /> + <location filename="../Preferences/ProgramsDialog.py" line="544" /> <location filename="../Preferences/ProgramsDialog.py" line="542" /> - <location filename="../Preferences/ProgramsDialog.py" line="540" /> <source>(not found)</source> <translation>(non trovato)</translation> </message> @@ -67058,7 +67271,7 @@ <translation>Alt+R</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="306" /> + <location filename="../Project/PropertiesDialog.py" line="312" /> <location filename="../Project/PropertiesDialog.py" line="71" /> <source>None</source> <translation type="unfinished">Nessuno</translation> @@ -67084,12 +67297,12 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="261" /> + <location filename="../Project/PropertiesDialog.py" line="267" /> <source>Source Files ({0});;All Files (*)</source> <translation>Source Files ({0});;All Files (*)</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="265" /> + <location filename="../Project/PropertiesDialog.py" line="271" /> <source>All Files (*)</source> <translation type="unfinished">Tutti i file (*)</translation> </message> @@ -67130,22 +67343,22 @@ <context> <name>Purge</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="76" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/purge.py" line="83" /> <source>Purge All Files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="77" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/purge.py" line="84" /> <source>Do really want to delete all files not tracked by Mercurial (including ignored ones)?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="82" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/purge.py" line="89" /> <source>Purge Files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="83" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/purge.py" line="90" /> <source>Do really want to delete files not tracked by Mercurial?</source> <translation type="unfinished" /> </message> @@ -67153,79 +67366,115 @@ <context> <name>PurgeProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="36" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="34" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="36" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="34" /> <source>Purge Files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="43" /> - <source>Delete files and directories not known to Mercurial</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="46" /> - <source><b>Purge Files</b><p>This deletes files and directories not known to Mercurial. That means that purge will delete:<ul><li>unknown files (marked with "not tracked" in the status dialog)</li><li>empty directories</li></ul>Note that ignored files will be left untouched.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="61" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="60" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="43" /> + <source>Delete not version controlled files and directories</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="46" /> + <source><b>Purge Files</b><p>This deletes not version controlled files and directories. That means that purge will delete:<ul><li>not version controlled files (marked with "not tracked" in the status dialog)</li><li>empty directories</li></ul>Note that ignored files will be left untouched.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="61" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="60" /> <source>Purge All Files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="68" /> - <source>Delete files and directories not known to Mercurial including ignored ones</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="74" /> - <source><b>Purge All Files</b><p>This deletes files and directories not known to Mercurial. That means that purge will delete:<ul><li>unknown files (marked with "not tracked" in the status dialog)</li><li>empty directories</li><li>ignored files and directories</li></ul></p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="89" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="68" /> + <source>Delete not version controlled files and directories including ignored ones</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="74" /> + <source><b>Purge All Files</b><p>This deletes not version controlled files and directories. That means that purge will delete:<ul><li>not version controlled files (marked with "not tracked" in the status dialog)</li><li>empty directories</li><li>ignored files and directories</li></ul></p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="90" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="89" /> + <source>Purge Ignored Files</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="97" /> + <source>Delete ignored files and directories</source> + <translation type="unfinished" /> + </message> + <message> + <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/PurgeExtension/ProjectHelper.py" line="91" /> + <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/PurgeExtension/ProjectHelper.py" line="98" /> - <source>List files and directories not known to Mercurial</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="101" /> - <source><b>List Files to be Purged</b><p>This lists files and directories not known to Mercurial. These would be deleted by the "Purge Files" menu entry.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="111" /> + <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="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="131" /> <source>List All Files to be Purged</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="112" /> + <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/PurgeExtension/ProjectHelper.py" line="119" /> - <source>List files and directories not known to Mercurial including ignored ones</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="125" /> - <source><b>List All Files to be Purged</b><p>This lists files and directories not known to Mercurial 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/PurgeExtension/ProjectHelper.py" line="163" /> + <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="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="156" /> + <source>List Ignored Files to be Purged</source> + <translation type="unfinished" /> + </message> + <message> + <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="164" /> + <source>List ignored files and directories</source> + <translation type="unfinished" /> + </message> + <message> + <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="206" /> <source>Purge</source> <translation type="unfinished" /> </message> @@ -76153,49 +76402,49 @@ <context> <name>Shelve</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="105" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="105" /> <source>Shelve current changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="151" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="151" /> <source>Restore shelved changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="170" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="170" /> <source>Abort restore operation</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="191" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="191" /> <source>Continue restore operation</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="211" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="211" /> <source>Select the shelves to be deleted:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="231" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="222" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="231" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="222" /> <source>Delete shelves</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="223" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="223" /> <source>Do you really want to delete these shelves?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="249" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="242" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="249" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="242" /> <source>Delete all shelves</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="243" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="243" /> <source>Do you really want to delete all shelved changes?</source> <translation type="unfinished" /> </message> @@ -76203,21 +76452,21 @@ <context> <name>ShelveProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="62" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="57" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="52" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="47" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="62" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="57" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="52" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="47" /> <source>Shelve changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="122" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="74" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="122" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="74" /> <source>Shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="104" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="104" /> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Il progetto deve essere riletto. Farlo ora ?</translation> </message> @@ -76225,154 +76474,154 @@ <context> <name>ShelveProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="34" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="34" /> <source>Shelve changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="35" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="35" /> <source>Shelve changes...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="42" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="42" /> <source>Shelve all current changes of the project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="45" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="45" /> <source><b>Shelve changes</b><p>This shelves all current changes of the project.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="54" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="54" /> <source>Show shelve browser</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="55" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="55" /> <source>Show shelve browser...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="61" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="61" /> <source>Show a dialog with all shelves</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="63" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="63" /> <source><b>Show shelve browser...</b><p>This shows a dialog listing all available shelves. Actions on these shelves may be executed via the context menu.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="74" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="74" /> <source>Restore shelved change</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="75" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="75" /> <source>Restore shelved change...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="82" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="82" /> <source>Restore a shelved change to the project directory</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="85" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="85" /> <source><b>Restore shelved change</b><p>This restore a shelved change to the project directory.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="95" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="95" /> <source>Abort restore</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="96" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="96" /> <source>Abort restore...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="103" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="103" /> <source>Abort the restore operation in progress</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="106" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="106" /> <source><b>Abort restore</b><p>This aborts the restore operation in progress and reverts already applied changes.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="116" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="116" /> <source>Continue restore</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="117" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="117" /> <source>Continue restore...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="124" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="124" /> <source>Continue the restore operation in progress</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="127" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="127" /> <source><b>Continue restore</b><p>This continues the restore operation in progress.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="136" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="136" /> <source>Delete shelved changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="137" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="137" /> <source>Delete shelved changes...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="144" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="144" /> <source><b>Delete shelved changes...</b><p>This opens a dialog to select the shelved changes to delete and deletes the selected ones.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="155" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="154" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="155" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="154" /> <source>Delete ALL shelved changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="162" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="162" /> <source><b>Delete ALL shelved changes</b><p>This deletes all shelved changes.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="231" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="202" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="231" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="202" /> <source>Shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="218" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="218" /> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Il progetto deve essere riletto. Farlo ora ?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="244" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="244" /> <source>Unshelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="251" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="251" /> <source>Abort Unshelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="258" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="258" /> <source>Continue Unshelve</source> <translation type="unfinished" /> </message> @@ -79006,41 +79255,10 @@ </message> </context> <context> - <name>Strip</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/strip.py" line="68" /> - <source>Stripping changesets from repository</source> - <translation type="unfinished" /> - </message> - </context> - <context> <name>StripProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="37" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="35" /> - <source>Strip changesets</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="43" /> - <source>Strip changesets from a repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="45" /> - <source><b>Strip changesets</b><p>This deletes a changeset and all its descendants from a repository. Each removed changeset will be stored in .hg/strip-backup as a bundle file.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="91" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="79" /> - <source>Strip</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="92" /> <source>The project should be reread. Do this now?</source> - <translation type="unfinished">Il progetto deve essere riletto. Farlo ora ?</translation> + <translation type="vanished">Il progetto deve essere riletto. Farlo ora ?</translation> </message> </context> <context> @@ -80152,12 +80370,12 @@ <context> <name>SvnDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="165" /> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="168" /> <source>Process Generation Error</source> <translation>Errore Generazione Processo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="166" /> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="169" /> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> </message> @@ -90643,6 +90861,66 @@ </message> </context> <context> + <name>Uncommit</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/uncommit.py" line="64" /> + <source>Undo Local Commit</source> + <translation type="unfinished" /> + </message> + </context> + <context> + <name>UncommitProjectBrowserHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="145" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="82" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="72" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="62" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="52" /> + <source>Undo Local Commit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="96" /> + <source>Uncommit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="126" /> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished">Il progetto deve essere riletto. Farlo ora ?</translation> + </message> + </context> + <context> + <name>UncommitProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="107" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="38" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="36" /> + <source>Undo Local Commit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="44" /> + <source>Undo the effect of a local commit.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="46" /> + <source><b>Undo Local Commit</b><p>This undoes the effect of a local commit, returning the affected files to their uncommitted state.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="79" /> + <source>Uncommit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="95" /> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished">Il progetto deve essere riletto. Farlo ora ?</translation> + </message> + </context> + <context> <name>UnittestExecutor</name> <message> <location filename="../Testing/Interfaces/UnittestExecutor.py" line="52" /> @@ -91289,7 +91567,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7892" /> + <location filename="../UI/UserInterface.py" line="7893" /> <location filename="../UI/UserInterface.py" line="1955" /> <location filename="../UI/UserInterface.py" line="1948" /> <source>Load session</source> @@ -92617,8 +92895,8 @@ <translation><b>Scorciatoie da tastiera</b><p>Imposta le scorciatoie da tastiera dell'applicazione con i valori personalizzati.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7600" /> - <location filename="../UI/UserInterface.py" line="7581" /> + <location filename="../UI/UserInterface.py" line="7601" /> + <location filename="../UI/UserInterface.py" line="7582" /> <location filename="../UI/UserInterface.py" line="3402" /> <source>Export Keyboard Shortcuts</source> <translation>Esporta scorciatoie da tastiera</translation> @@ -92639,7 +92917,7 @@ <translation><b>Esporta scorciatoie da tastiera</b><p>Esporta le scorciatoie da tastiera dell'applicazione.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7619" /> + <location filename="../UI/UserInterface.py" line="7620" /> <location filename="../UI/UserInterface.py" line="3421" /> <source>Import Keyboard Shortcuts</source> <translation>Importa scorciatoie da tastiera</translation> @@ -93365,169 +93643,169 @@ <translation>Il processo '{0}' è terminato.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7108" /> - <location filename="../UI/UserInterface.py" line="7046" /> - <location filename="../UI/UserInterface.py" line="7002" /> - <location filename="../UI/UserInterface.py" line="6928" /> - <location filename="../UI/UserInterface.py" line="6864" /> - <source>Documentation Missing</source> - <translation>Documentazione mancante</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="7109" /> <location filename="../UI/UserInterface.py" line="7047" /> <location filename="../UI/UserInterface.py" line="7003" /> <location filename="../UI/UserInterface.py" line="6929" /> <location filename="../UI/UserInterface.py" line="6865" /> + <source>Documentation Missing</source> + <translation>Documentazione mancante</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7110" /> + <location filename="../UI/UserInterface.py" line="7048" /> + <location filename="../UI/UserInterface.py" line="7004" /> + <location filename="../UI/UserInterface.py" line="6930" /> + <location filename="../UI/UserInterface.py" line="6866" /> <source><p>The documentation starting point "<b>{0}</b>" could not be found.</p></source> <translation><p>L'inizio della documentazione "<b>{0}</b>" non viene trovato.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7090" /> - <location filename="../UI/UserInterface.py" line="6972" /> - <source>Documentation</source> - <translation>Documentazione</translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="6973" /> - <source><p>The PyQt{0} documentation starting point has not been configured.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="7091" /> + <location filename="../UI/UserInterface.py" line="6973" /> + <source>Documentation</source> + <translation>Documentazione</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="6974" /> + <source><p>The PyQt{0} documentation starting point has not been configured.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7092" /> <source><p>The PySide{0} documentation starting point has not been configured.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7270" /> - <location filename="../UI/UserInterface.py" line="7206" /> - <source>Start Web Browser</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../UI/UserInterface.py" line="7207" /> - <source>The eric web browser could not be started.</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="7271" /> + <location filename="../UI/UserInterface.py" line="7207" /> + <source>Start Web Browser</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7208" /> + <source>The eric web browser could not be started.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7272" /> <source><p>The eric web browser is not started.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7317" /> + <location filename="../UI/UserInterface.py" line="7318" /> <source>Open Browser</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7317" /> + <location filename="../UI/UserInterface.py" line="7318" /> <source>Could not start a web browser</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7621" /> - <location filename="../UI/UserInterface.py" line="7583" /> + <location filename="../UI/UserInterface.py" line="7622" /> + <location filename="../UI/UserInterface.py" line="7584" /> <source>Keyboard Shortcuts File (*.ekj)</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7601" /> + <location filename="../UI/UserInterface.py" line="7602" /> <source><p>The keyboard shortcuts file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7805" /> + <location filename="../UI/UserInterface.py" line="7806" /> <source>Load crash session...</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7808" /> + <location filename="../UI/UserInterface.py" line="7809" /> <source>Clean crash sessions...</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7845" /> - <source>Read Session</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="7846" /> + <source>Read Session</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7847" /> <source><p>The session file <b>{0}</b> could not be read.</p></source> <translation><p>Il file sessione <b>{0}</b> non può essere letto.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7869" /> + <location filename="../UI/UserInterface.py" line="7870" /> <source>Save Session</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7894" /> - <location filename="../UI/UserInterface.py" line="7871" /> + <location filename="../UI/UserInterface.py" line="7895" /> + <location filename="../UI/UserInterface.py" line="7872" /> <source>eric Session Files (*.esj)</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7963" /> - <source>Found Crash Sessions</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="7964" /> + <source>Found Crash Sessions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7965" /> <source>These crash session files were found. Select the one to open. Select 'Cancel' to not open a crash session.</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="8037" /> - <source>Clean stale crash sessions</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="8038" /> + <source>Clean stale crash sessions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8039" /> <source>Do you really want to delete these stale crash session files?</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="8414" /> - <source>Drop Error</source> - <translation>Errore Drop</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="8415" /> + <source>Drop Error</source> + <translation>Errore Drop</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8416" /> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> non è un file.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="8612" /> - <source>Upgrade available</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="8613" /> + <source>Upgrade available</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8614" /> <source><p>A newer version of the <b>eric-ide</b> package is available at <a href="{0}/eric-ide/">PyPI</a>.</p><p>Installed: {1}<br/>Available: <b>{2}</b></p><p>Shall <b>eric-ide</b> be upgraded?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="8661" /> - <source>First time usage</source> - <translation>Primo avvio</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="8662" /> + <source>First time usage</source> + <translation>Primo avvio</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8663" /> <source>eric has not been configured yet. The configuration dialog will be started.</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="8684" /> + <location filename="../UI/UserInterface.py" line="8685" /> <source>Select Workspace Directory</source> <translation type="unfinished">Seleziona cartella di lavoro</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="8852" /> - <source>Unsaved Data Detected</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="8853" /> + <source>Unsaved Data Detected</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8854" /> <source>Some editors contain unsaved data. Shall these be saved?</source> <translation type="unfinished" /> </message> @@ -100534,8 +100812,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>&Browsing History</source> - <translation type="unfinished">Cronologia di &Navigazione</translation> + <source>Browsing History</source> + <translation type="unfinished" /> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100574,8 +100852,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>&Search History</source> - <translation type="unfinished">Cronologia &Ricerche</translation> + <source>Search History</source> + <translation type="unfinished" /> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100584,8 +100862,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>Download &History</source> - <translation type="unfinished">Scarica cronolo&gia</translation> + <source>Download History</source> + <translation type="unfinished" /> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100594,8 +100872,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>&Cookies</source> - <translation type="unfinished">&Cookies</translation> + <source>Cookies</source> + <translation type="unfinished">Cookies</translation> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100604,8 +100882,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>Cached &Web Pages</source> - <translation type="unfinished">Pagine &Web in cache</translation> + <source>Cached Web Pages</source> + <translation type="unfinished" /> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100614,8 +100892,18 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>Website &Icons</source> - <translation type="unfinished">&Icone Siti Web</translation> + <source>Website Icons</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> + <source>Select to clear the website permissions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> + <source>Website Permissions</source> + <translation type="unfinished" /> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100624,8 +100912,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>Saved &Passwords</source> - <translation type="unfinished">&Password salvate</translation> + <source>Saved Passwords</source> + <translation type="unfinished">Password salvate</translation> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100634,7 +100922,7 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>&Zoom Settings</source> + <source>Zoom Settings</source> <translation type="unfinished" /> </message> <message> @@ -100642,6 +100930,34 @@ <source>SSL Certificate Error Exceptions</source> <translation type="unfinished" /> </message> + <message> + <source>&Browsing History</source> + <translation type="vanished">Cronologia di &Navigazione</translation> + </message> + <message> + <source>&Search History</source> + <translation type="vanished">Cronologia &Ricerche</translation> + </message> + <message> + <source>Download &History</source> + <translation type="vanished">Scarica cronolo&gia</translation> + </message> + <message> + <source>&Cookies</source> + <translation type="vanished">&Cookies</translation> + </message> + <message> + <source>Cached &Web Pages</source> + <translation type="vanished">Pagine &Web in cache</translation> + </message> + <message> + <source>Website &Icons</source> + <translation type="vanished">&Icone Siti Web</translation> + </message> + <message> + <source>Saved &Passwords</source> + <translation type="vanished">&Password salvate</translation> + </message> </context> <context> <name>WebBrowserJavaScriptConsole</name> @@ -101175,6 +101491,16 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/WebBrowserPage.ui" line="0" /> + <source>Select to store website permission settings in memory only.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserPage.ui" line="0" /> + <source>Do not persist website permissions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserPage.ui" line="0" /> <source><p>Select to allow reading from all canvas elements.</p> <p><b>Note:</b> Disable this option to prevent canvas fingerprinting.</p></source> <translation type="unfinished" /> @@ -101588,32 +101914,87 @@ <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="194" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="78" /> + <source><p>Allow <b>{0}</b> to access your location information?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="83" /> + <source><p>Allow <b>{0}</b> to access your microphone?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="89" /> + <source><p>Allow <b>{0}</b> to access your webcam?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="95" /> + <source><p>Allow <b>{0}</b> to access your microphone and webcam?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="100" /> + <source><p>Allow <b>{0}</b> to lock your mouse cursor?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="105" /> + <source><p>Allow <b>{0}</b> to capture video of your desktop?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="111" /> + <source><p>Allow <b>{0}</b> to capture audio and video of your desktop?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="118" /> + <source><p>Allow <b>{0}</b> to show notifications on your desktop?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="124" /> + <source><p>Allow <b>{0}</b> to read from and write to the clipboard?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="130" /> + <source><p>Allow <b>{0}</b> to access fonts stored on this machine?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="269" /> <source>Suspicuous URL detected</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="195" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="270" /> <source><p>The URL <b>{0}</b> was found in the Safe Browsing database.</p>{1}</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="541" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="396" /> + <source>Permission Request</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="636" /> <source>Register Protocol Handler</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="542" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="637" /> <source><p>Allow the Web Site <b>{0}</b> to handle all <b>{1}</b> links?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="631" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="726" /> <source>SSL Info</source> <translation type="unfinished">Informazioni SSL</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="632" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="727" /> <source>This site does not contain SSL information.</source> <translation type="unfinished">Questo sito non contiene informazioni SSL.</translation> </message> @@ -104208,15 +104589,15 @@ <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5231" /> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5221" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5248" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5238" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2220" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2218" /> <source>IP Address Report</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5245" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5262" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2232" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2230" /> <source>Domain Report</source> @@ -104243,8 +104624,8 @@ <translation type="unfinished"><b>Scorciatoie da tastiera</b><p>Imposta le scorciatoie da tastiera dell'applicazione con i valori personalizzati.</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5651" /> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5632" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5675" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5656" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2270" /> <source>Export Keyboard Shortcuts</source> <translation type="unfinished" /> @@ -104265,7 +104646,7 @@ <translation type="unfinished"><b>Esporta scorciatoie da tastiera</b><p>Esporta le scorciatoie da tastiera dell'applicazione.</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5671" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5695" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2289" /> <source>Import Keyboard Shortcuts</source> <translation type="unfinished" /> @@ -104515,99 +104896,99 @@ <translation type="unfinished">Motore di help</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4768" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4785" /> <source>System</source> <translation type="unfinished">Sistema</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4772" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4789" /> <source>ISO</source> <translation type="unfinished">ISO</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4775" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4792" /> <source>Unicode</source> <translation type="unfinished">Unicode</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4778" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4795" /> <source>Windows</source> <translation type="unfinished">Windows</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4781" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4798" /> <source>IBM</source> <translation type="unfinished">IBM</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4784" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4801" /> <source>Apple</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4787" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4804" /> <source>Other</source> <translation type="unfinished">Altro</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4814" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4831" /> <source>Menu Bar</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4819" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4836" /> <source>Bookmarks</source> <translation type="unfinished">Segnalibri</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4824" /> - <source>Status Bar</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4839" /> - <source>&Show all</source> - <translation type="unfinished">Mo&stra tutti</translation> - </message> - <message> <location filename="../WebBrowser/WebBrowserWindow.py" line="4841" /> + <source>Status Bar</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4856" /> + <source>&Show all</source> + <translation type="unfinished">Mo&stra tutti</translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4858" /> <source>&Hide all</source> <translation type="unfinished">Nascondi &tutti</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5187" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5204" /> <source>VirusTotal Scan</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5188" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5205" /> <source><p>The VirusTotal scan could not be scheduled.<p> <p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5222" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5239" /> <source>Enter a valid IPv4 address in dotted quad notation:</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5232" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5249" /> <source>The given IP address is not in dotted quad notation.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5246" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5263" /> <source>Enter a valid domain name:</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5673" /> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5634" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5697" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5658" /> <source>Keyboard Shortcuts File (*.ekj)</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5652" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5676" /> <source><p>The keyboard shortcuts file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished" /> </message> @@ -105710,32 +106091,32 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1383" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1389" /> <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>Origine #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1955" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1391" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1964" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397" /> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Tags</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1961" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1970" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1403" /> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Segnalibri</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1968" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1404" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1977" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1410" /> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branches</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1410" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1416" /> <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> @@ -105744,7 +106125,7 @@ <tr><td><b>Committed time</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1429" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1435" /> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -105761,36 +106142,36 @@ </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1929" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1938" /> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1936" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945" /> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1943" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1952" /> <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="1948" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1957" /> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Changeset</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1975" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1984" /> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Origini</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1981" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990" /> <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>
--- a/src/eric7/i18n/eric7_pt.ts Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/i18n/eric7_pt.ts Tue Jan 14 17:29:56 2025 +0100 @@ -7726,18 +7726,18 @@ <translation>Gráficos</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="896" /> + <location filename="../Preferences/ConfigurationDialog.py" line="903" /> <location filename="../Preferences/ConfigurationDialog.py" line="228" /> <source>Hex Editor</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1129" /> - <location filename="../Preferences/ConfigurationDialog.py" line="1090" /> - <location filename="../Preferences/ConfigurationDialog.py" line="982" /> - <location filename="../Preferences/ConfigurationDialog.py" line="944" /> - <location filename="../Preferences/ConfigurationDialog.py" line="913" /> - <location filename="../Preferences/ConfigurationDialog.py" line="882" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1136" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1097" /> + <location filename="../Preferences/ConfigurationDialog.py" line="989" /> + <location filename="../Preferences/ConfigurationDialog.py" line="951" /> + <location filename="../Preferences/ConfigurationDialog.py" line="920" /> + <location filename="../Preferences/ConfigurationDialog.py" line="889" /> <location filename="../Preferences/ConfigurationDialog.py" line="785" /> <location filename="../Preferences/ConfigurationDialog.py" line="670" /> <location filename="../Preferences/ConfigurationDialog.py" line="235" /> @@ -7755,7 +7755,7 @@ <translation>Visor de Registos</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1104" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1111" /> <location filename="../Preferences/ConfigurationDialog.py" line="250" /> <source>MicroPython</source> <translation type="unfinished" /> @@ -7772,8 +7772,9 @@ <translation>Rede</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1111" /> - <location filename="../Preferences/ConfigurationDialog.py" line="958" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1118" /> + <location filename="../Preferences/ConfigurationDialog.py" line="965" /> + <location filename="../Preferences/ConfigurationDialog.py" line="806" /> <location filename="../Preferences/ConfigurationDialog.py" line="271" /> <source>Network Proxy</source> <translation type="unfinished">Utilizar proxy de rede</translation> @@ -7784,13 +7785,13 @@ <translation>Notificações</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="927" /> + <location filename="../Preferences/ConfigurationDialog.py" line="934" /> <location filename="../Preferences/ConfigurationDialog.py" line="285" /> <source>PDF Viewer</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="965" /> + <location filename="../Preferences/ConfigurationDialog.py" line="972" /> <location filename="../Preferences/ConfigurationDialog.py" line="292" /> <source>Python Package Management</source> <translation type="unfinished" /> @@ -7801,7 +7802,7 @@ <translation>Gestor de Plugins</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="806" /> + <location filename="../Preferences/ConfigurationDialog.py" line="813" /> <location filename="../Preferences/ConfigurationDialog.py" line="684" /> <location filename="../Preferences/ConfigurationDialog.py" line="306" /> <source>Printer</source> @@ -7818,13 +7819,13 @@ <translation>Qt</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="813" /> + <location filename="../Preferences/ConfigurationDialog.py" line="820" /> <location filename="../Preferences/ConfigurationDialog.py" line="321" /> <source>Security</source> <translation>Segurança</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="996" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1003" /> <location filename="../Preferences/ConfigurationDialog.py" line="328" /> <source>Shell</source> <translation>Shell</translation> @@ -7840,7 +7841,7 @@ <translation>Modelos</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="865" /> + <location filename="../Preferences/ConfigurationDialog.py" line="872" /> <location filename="../Preferences/ConfigurationDialog.py" line="343" /> <source>Tray Starter</source> <translation>Iniciador de Bandeja de Sistema</translation> @@ -7856,7 +7857,7 @@ <translation>Depurador</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1003" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1010" /> <location filename="../Preferences/ConfigurationDialog.py" line="698" /> <location filename="../Preferences/ConfigurationDialog.py" line="399" /> <location filename="../Preferences/ConfigurationDialog.py" line="364" /> @@ -7891,14 +7892,14 @@ <translation>Tratamento de Ficheiros</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1010" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1017" /> <location filename="../Preferences/ConfigurationDialog.py" line="712" /> <location filename="../Preferences/ConfigurationDialog.py" line="413" /> <source>Searching</source> <translation>Pesquisa</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="848" /> + <location filename="../Preferences/ConfigurationDialog.py" line="855" /> <location filename="../Preferences/ConfigurationDialog.py" line="719" /> <location filename="../Preferences/ConfigurationDialog.py" line="648" /> <location filename="../Preferences/ConfigurationDialog.py" line="420" /> @@ -7906,7 +7907,7 @@ <translation>Verificação ortográfica</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1017" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1024" /> <location filename="../Preferences/ConfigurationDialog.py" line="726" /> <location filename="../Preferences/ConfigurationDialog.py" line="427" /> <source>Style</source> @@ -7929,14 +7930,14 @@ <translation>Exportadores</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1024" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1031" /> <location filename="../Preferences/ConfigurationDialog.py" line="455" /> <source>Autocompletion</source> <translation>Autocompletar</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1045" /> - <location filename="../Preferences/ConfigurationDialog.py" line="1031" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1052" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1038" /> <location filename="../Preferences/ConfigurationDialog.py" line="483" /> <location filename="../Preferences/ConfigurationDialog.py" line="462" /> <source>QScintilla</source> @@ -7950,13 +7951,13 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1038" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1045" /> <location filename="../Preferences/ConfigurationDialog.py" line="476" /> <source>Calltips</source> <translation>Dicas</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1052" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1059" /> <location filename="../Preferences/ConfigurationDialog.py" line="740" /> <location filename="../Preferences/ConfigurationDialog.py" line="497" /> <source>Highlighters</source> @@ -7969,21 +7970,21 @@ <translation>Associações de Tipos de Ficheiros</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1059" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1066" /> <location filename="../Preferences/ConfigurationDialog.py" line="754" /> <location filename="../Preferences/ConfigurationDialog.py" line="511" /> <source>Styles</source> <translation>Estilos</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1066" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1073" /> <location filename="../Preferences/ConfigurationDialog.py" line="761" /> <location filename="../Preferences/ConfigurationDialog.py" line="518" /> <source>Keywords</source> <translation>Palavras Chave</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1073" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1080" /> <location filename="../Preferences/ConfigurationDialog.py" line="768" /> <location filename="../Preferences/ConfigurationDialog.py" line="525" /> <source>Properties</source> @@ -8000,7 +8001,7 @@ <translation>Ajuda</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="820" /> + <location filename="../Preferences/ConfigurationDialog.py" line="827" /> <location filename="../Preferences/ConfigurationDialog.py" line="553" /> <source>Help Documentation</source> <translation>Documentação de Ajuda</translation> @@ -8027,12 +8028,12 @@ <translation>Multiprojeto</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1136" /> - <location filename="../Preferences/ConfigurationDialog.py" line="1097" /> - <location filename="../Preferences/ConfigurationDialog.py" line="989" /> - <location filename="../Preferences/ConfigurationDialog.py" line="951" /> - <location filename="../Preferences/ConfigurationDialog.py" line="920" /> - <location filename="../Preferences/ConfigurationDialog.py" line="889" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1143" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1104" /> + <location filename="../Preferences/ConfigurationDialog.py" line="996" /> + <location filename="../Preferences/ConfigurationDialog.py" line="958" /> + <location filename="../Preferences/ConfigurationDialog.py" line="927" /> + <location filename="../Preferences/ConfigurationDialog.py" line="896" /> <location filename="../Preferences/ConfigurationDialog.py" line="792" /> <location filename="../Preferences/ConfigurationDialog.py" line="677" /> <location filename="../Preferences/ConfigurationDialog.py" line="602" /> @@ -8051,47 +8052,47 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="827" /> + <location filename="../Preferences/ConfigurationDialog.py" line="834" /> <location filename="../Preferences/ConfigurationDialog.py" line="627" /> <source>Appearance</source> <translation>Aparência</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="834" /> - <location filename="../Preferences/ConfigurationDialog.py" line="634" /> - <source>eric Web Browser</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Preferences/ConfigurationDialog.py" line="841" /> + <location filename="../Preferences/ConfigurationDialog.py" line="634" /> + <source>eric Web Browser</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationDialog.py" line="848" /> <location filename="../Preferences/ConfigurationDialog.py" line="641" /> <source>VirusTotal Interface</source> <translation>Interface de VirusTotal</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1228" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1235" /> <source>Enter search text...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1303" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1310" /> <source>Preferences</source> <translation>Preferências</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1309" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1316" /> <source>Please select an entry of the list to display the configuration page.</source> <translation>Por favor selecione uma entrada da lista para mostrar a página de configuração.</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1392" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1399" /> <source>Configuration Page Error</source> <translation>Erro na Página de Configuração</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1393" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1400" /> <source><p>The configuration page <b>{0}</b> could not be loaded.</p></source> <translation><p>A página de configuração <b>{0}</b> não pôde ser carregada.</p></translation> </message> @@ -10666,12 +10667,12 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="1691" /> + <location filename="../Debugger/DebuggerInterfacePython.py" line="1692" /> <source>Debug Protocol Error</source> <translation type="unfinished" /> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="1692" /> + <location filename="../Debugger/DebuggerInterfacePython.py" line="1693" /> <source><p>The response received from the debugger backend could not be decoded. Please report this issue with the received data to the eric bugs email address.</p><p>Error: {0}</p><p>Data:<br/>{1}</p></source> <translation type="unfinished" /> </message> @@ -22697,64 +22698,147 @@ </message> </context> <context> + <name>Fastexport</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="183" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="174" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="168" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="159" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="133" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="113" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="57" /> + <source>Mercurial Fastexport</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="58" /> + <source><p>The output file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="107" /> + <source>Cancel</source> + <translation type="unfinished">Cancelar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="110" /> + <source>%v/%m Changesets</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="116" /> + <source>Exporting repository (time remaining: {0}) ...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="134" /> + <source><p>The repository fastexport process sent an error message.</p><p>{0}</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="160" /> + <source><p>The repository fastexport process finished successfully.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="169" /> + <source><p>The repository fastexport process was cancelled.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="175" /> + <source><p>The repository fastexport process finished with exit code <b>{0}</b>.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="184" /> + <source><p>The repository fastexport process crashed.</p></source> + <translation type="unfinished" /> + </message> + </context> + <context> + <name>FastexportProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="37" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="35" /> + <source>Export to git</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="44" /> + <source>Export the repository as git fast-import stream.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="47" /> + <source><b>Export to git</b><p>This exports the repository as a git fast-import stream.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="79" /> + <source>Fastexport</source> + <translation type="unfinished" /> + </message> + </context> + <context> <name>FeaturePermissionBar</name> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="48" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="50" /> <source>{0} wants to use your position.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="51" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="53" /> <source>{0} wants to use your microphone.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="54" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="56" /> <source>{0} wants to use your camera.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="57" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="59" /> <source>{0} wants to use your microphone and camera.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="60" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="62" /> <source>{0} wants to lock your mouse.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="61" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="63" /> <source>{0} wants to capture video of your screen.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="64" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="66" /> <source>{0} wants to capture audio and video of your screen.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="67" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="69" /> <source>{0} wants to use desktop notifications.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="92" /> - <source>Remember</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="94" /> + <source>Remember</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="96" /> <source>Allow</source> <translation type="unfinished">Permitir</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="95" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="97" /> <source>Deny</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="120" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="122" /> <source>{0} wants to use an unknown feature.</source> <translation type="unfinished" /> </message> @@ -22762,80 +22846,106 @@ <context> <name>FeaturePermissionsDialog</name> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="161" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="143" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="127" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="109" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="93" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="79" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="65" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="49" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="208" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="190" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="170" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="152" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="136" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="118" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="102" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="88" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="74" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="58" /> <source>Host</source> <translation type="unfinished">Anfitrião</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="162" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="144" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="128" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="110" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="94" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="80" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="66" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="50" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="209" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="191" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="171" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="153" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="137" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="119" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="103" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="89" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="75" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="59" /> <source>Permission</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="54" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="63" /> <source>Notifications</source> <translation type="unfinished">Notificações</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="68" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="77" /> <source>Geolocation</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="82" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="91" /> <source>Microphone</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="96" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="105" /> <source>Camera</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="114" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="123" /> <source>Microphone && Camera</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="130" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="139" /> <source>Mouse Lock</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="148" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="157" /> <source>Desktop Video</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="166" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="175" /> <source>Desktop Audio && Video</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="181" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="195" /> + <source>Clipboard</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="213" /> + <source>Local Fonts</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="296" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="253" /> <source>Allow</source> <translation type="unfinished">Permitir</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="182" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="297" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="254" /> <source>Deny</source> <translation type="unfinished" /> </message> <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="255" /> + <source>Always Ask</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="256" /> + <source>Invalid</source> + <translation type="unfinished" /> + </message> + <message> <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.ui" line="0" /> <source>HTML5 Feature Permissions</source> <translation type="unfinished" /> @@ -24706,74 +24816,74 @@ <translation type="unfinished" /> </message> <message> - <location filename="../UI/FindFileWidget.py" line="750" /> + <location filename="../UI/FindFileWidget.py" line="749" /> <source>Invalid search expression</source> <translation type="unfinished">Expressão de pesquisa inválida</translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="751" /> + <location filename="../UI/FindFileWidget.py" line="750" /> <source><p>The search expression is not valid.</p><p>Error: {0}</p></source> <translation type="unfinished"><p>A expressão de pesquisa não é válida.</p><p>Erro: {0}</p></translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="878" /> + <location filename="../UI/FindFileWidget.py" line="877" /> <source>{0} / {1}</source> <comment>occurrences / files</comment> <translation type="unfinished" /> </message> <message numerus="yes"> - <location filename="../UI/FindFileWidget.py" line="881" /> + <location filename="../UI/FindFileWidget.py" line="880" /> <source>%n occurrence(s)</source> <translation type="unfinished"> <numerusform /> </translation> </message> <message numerus="yes"> - <location filename="../UI/FindFileWidget.py" line="882" /> + <location filename="../UI/FindFileWidget.py" line="881" /> <source>%n file(s)</source> <translation type="unfinished"> <numerusform /> </translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1081" /> - <location filename="../UI/FindFileWidget.py" line="1056" /> - <location filename="../UI/FindFileWidget.py" line="1042" /> + <location filename="../UI/FindFileWidget.py" line="1080" /> + <location filename="../UI/FindFileWidget.py" line="1055" /> + <location filename="../UI/FindFileWidget.py" line="1041" /> <source>Replace in Files</source> <translation type="unfinished">Substituir em Ficheiros</translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1043" /> + <location filename="../UI/FindFileWidget.py" line="1042" /> <source><p>Could not read the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation type="unfinished"><p>Não se pôde ler o ficheiro <b>{0}</b>. Ignorando-o.</p><p>Razão: {1}</p></translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1057" /> + <location filename="../UI/FindFileWidget.py" line="1056" /> <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 type="unfinished" /> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1082" /> + <location filename="../UI/FindFileWidget.py" line="1081" /> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation type="unfinished"><p>Não se pôde gravar o ficheiro <b>{0}</b>. Ignorando-o.</p><p>Razão: {1}</p></translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1111" /> + <location filename="../UI/FindFileWidget.py" line="1110" /> <source>Open</source> <translation type="unfinished">Abrir</translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1113" /> + <location filename="../UI/FindFileWidget.py" line="1112" /> <source>Copy Path to Clipboard</source> <translation type="unfinished">Copiar Rota à Área de Transferência</translation> </message> <message> + <location filename="../UI/FindFileWidget.py" line="1116" /> + <source>Select All</source> + <translation type="unfinished">Selecionar Tudo</translation> + </message> + <message> <location filename="../UI/FindFileWidget.py" line="1117" /> - <source>Select All</source> - <translation type="unfinished">Selecionar Tudo</translation> - </message> - <message> - <location filename="../UI/FindFileWidget.py" line="1118" /> <source>Deselect All</source> <translation type="unfinished" /> </message> @@ -26952,37 +27062,37 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="91" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="94" /> <source>Additional Output</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="110" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="113" /> <source>Process canceled.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="124" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="127" /> <source>Process finished successfully.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="126" /> - <source>Process crashed.</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="129" /> + <source>Process crashed.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="132" /> <source>Process finished with exit code {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="195" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="198" /> <source>Process Generation Error</source> <translation type="unfinished">Erro na Criação de Processo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="196" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="199" /> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Não pôde iniciar {0}.<br>Certifique-se de que está na rota de pesquisa.</translation> </message> @@ -35353,456 +35463,456 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="303" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="309" /> <source>Create project repository</source> <translation>Criar repositorio do projeto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="304" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="310" /> <source>The project repository could not be created.</source> <translation>O repositorio do projeto não se pôde criar.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="338" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="344" /> <source>Creating Mercurial repository</source> <translation>A criar repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="359" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="365" /> <source>Initial commit to Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="405" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="411" /> <source>Cloning project from a Mercurial repository</source> <translation>A clonar projeto dum repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="516" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="522" /> <source>Commit Changes</source> <translation>Aplicar Alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="517" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="523" /> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="580" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="586" /> <source>Committing changes to Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="679" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="685" /> <source>Synchronizing with the Mercurial repository</source> <translation>A sincronizar com o repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="719" /> <source>Adding files/directories to the Mercurial repository</source> <translation>A adicionar ficheiros/diretorios ao repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="774" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="780" /> <source>Removing files/directories from the Mercurial repository</source> <translation>A retirar ficheiros/diretorios do repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="829" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="835" /> <source>Renaming {0}</source> <translation>A renomear {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="964" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="970" /> <source>Tagging in the Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1011" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1000" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1017" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006" /> <source>Revert changes</source> <translation>Desfazer alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1001" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1007" /> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1012" /> - <source>Do you really want to revert all changes of the project?</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1018" /> + <source>Do you really want to revert all changes of the project?</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1024" /> <source>Reverting changes</source> <translation>Desfazer alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1064" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1070" /> <source>Merging</source> <translation>A mesclar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1095" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1109" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101" /> <source>Re-Merge</source> <translation>Remesclar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1102" /> <source>Do you really want to re-merge these files or directories?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1104" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1110" /> <source>Do you really want to re-merge the project?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1114" /> <source>Re-Merging</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1131" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1137" /> <source>Current branch tip</source> <translation>Dica de ramo atual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1314" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1320" /> <source>Mercurial command</source> <translation>Comando de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1492" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1498" /> <source>Copying {0}</source> <translation>A copiar {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1758" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1746" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1764" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1752" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743" /> <source>Mercurial Side-by-Side Difference</source> <translation>Diferenças lado a lado de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1759" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1765" /> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>O ficheiro <b>{0}</b> não se pôde ler.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2457" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2446" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2436" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1835" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2455" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844" /> <source>Apply changegroups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1838" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1847" /> <source>Pulling from a remote Mercurial repository</source> <translation>A puxar dum repositorio Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1884" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1893" /> <source>Pushing to a remote Mercurial repository</source> <translation>A empurrar a um repositorio Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2027" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2036" /> <source>Marking as 'unresolved'</source> <translation>A marcar como 'sem resolver'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2029" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038" /> <source>Marking as 'resolved'</source> <translation>A marcar como 'resolvido'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2051" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060" /> <source>Aborting uncommitted merge</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2084" /> <source>Creating branch in the Mercurial repository</source> <translation>A criar ramo no repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086" /> - <source>Created new branch <{0}>.</source> - <translation>Criado o novo ramo <{0}>.</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2095" /> + <source>Created new branch <{0}>.</source> + <translation>Criado o novo ramo <{0}>.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2104" /> <source>Showing current branch</source> <translation>A mostrar o ramo atual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2184" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193" /> <source>Verifying the integrity of the Mercurial repository</source> <translation>A verificar a integridade do repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2200" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209" /> <source>Showing the combined configuration settings</source> <translation>A mostrar as definições de configuração combinadas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2224" /> <source>Showing aliases for remote repositories</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2230" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239" /> <source>Recovering from interrupted transaction</source> <translation>A recuperar duma transação interrompida</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254" /> <source>Identifying project directory</source> <translation>A identificar o diretorio do projeto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2291" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2300" /> <source>Create .hgignore file</source> <translation>Criar ficheiro .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2292" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301" /> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>O ficheiro <b>{0}</b> já existe. Sobreescrever?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2395" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2369" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2351" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2404" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2378" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2360" /> <source>Create changegroup</source> <translation>Criar conjunto de alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2353" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362" /> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2370" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2379" /> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2409" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2418" /> <source>Preview changegroup</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2438" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2411" /> - <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2447" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2420" /> + <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2456" /> <source>Shall the working directory be updated?</source> <translation>O diretorio de trabalho deve ser atualizado?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2479" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2488" /> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2501" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2510" /> <source>Mercurial Bisect ({0})</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2527" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2536" /> <source>Removing files from the Mercurial repository only</source> <translation>A retirar ficheiros apenas do repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2576" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2557" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2585" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2566" /> <source>Backing out changeset</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2558" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2567" /> <source>No revision given. Aborting...</source> <translation>Não foi dada revisão. Terminando...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2587" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2602" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2596" /> <source>Rollback last transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2588" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2597" /> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2657" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2666" /> <source>Import Patch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2707" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2716" /> <source>Export Patches</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2749" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2758" /> <source>Change Phase</source> <translation>Mudar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2804" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813" /> <source>Copy Changesets</source> <translation type="unfinished">Copiar Conjuntos de Alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2843" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2852" /> <source>Copy Changesets (Continue)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2853" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2862" /> <source>Copy Changesets (Stop)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2863" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2872" /> <source>Copy Changesets (Abort)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2887" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2896" /> <source>Create Unversioned Archive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2902" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2911" /> <source>Delete All Backups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2903" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2912" /> <source><p>Do you really want to delete all backup bundles stored in the backup area?<br/><b>{0}</b></p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2994" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2974" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2963" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2983" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2972" /> <source>Add Sub-repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3033" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2964" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3042" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2973" /> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2975" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2984" /> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3051" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3060" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3004" /> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3050" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3032" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3018" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3059" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3027" /> <source>Remove Sub-repositories</source> <translation>Retirar Sub Repositórios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3019" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3028" /> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3296" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3138" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3147" /> <source>Mercurial Command Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3139" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3148" /> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3297" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3321" /> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3420" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3444" /> <source>Mercurial Bookmark</source> <translation>Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3437" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3461" /> <source>Delete Bookmark</source> <translation>Apagar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3438" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3462" /> <source>Select the bookmark to be deleted:</source> <translation>Selecionar o marcador a apagar:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3449" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3473" /> <source>Delete Mercurial Bookmark</source> <translation>Apagar o Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3476" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3500" /> <source>Rename Mercurial Bookmark</source> <translation>Renomear o Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3518" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3542" /> <source>Move Mercurial Bookmark</source> <translation>Mover o Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3600" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3624" /> <source>Pull Bookmark</source> <translation>Puxar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3601" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3625" /> <source>Select the bookmark to be pulled:</source> <translation>Selecionar o marcador a puxar:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3613" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3637" /> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>A puxar marcador desde o repositório remoto de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3641" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3665" /> <source>Push Bookmark</source> <translation>Empurrar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3642" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3666" /> <source>Select the bookmark to be push:</source> <translation>Selecione o marcador a empurrar:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3657" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3681" /> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>A empurrar marcador a um repositório remoto de Mercurial</translation> </message> @@ -36648,42 +36758,42 @@ <context> <name>HgClient</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="98" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="100" /> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Não pôde iniciar {0}.<br>Certifique-se de que está na rota de pesquisa.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="147" /> - <source>Did not receive the 'hello' message.</source> - <translation>Não recebeu a mensagem 'hello'.</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="149" /> + <source>Did not receive the 'hello' message.</source> + <translation>Não recebeu a mensagem 'hello'.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="151" /> <source>Received data on unexpected channel.</source> <translation>Dados recebidos num canal imprevisto.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="154" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="156" /> <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> <translation>Mensagem 'hello' má, esperava-se 'capabilities: ' mas teve '{0}'.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="159" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="161" /> <source>'capabilities' message did not contain any capability.</source> <translation>Mensagem 'capabilities' não tinha nenhuma capacidade.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="168" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="170" /> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation>Mensagem 'hello' má, esperava-se 'encoding: ' mas teve '{0}'.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="173" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="175" /> <source>'encoding' message did not contain any encoding.</source> <translation>Mensagem 'encoding' não tinha nenhuma codificação.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="385" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="387" /> <source>For message see output dialog.</source> <translation>Para a mensagem ver a caixa de diálogo da saída de comandos.</translation> </message> @@ -37050,6 +37160,11 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="0" /> + <source>%v/%m</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="0" /> <source>Errors</source> <translation>Erros</translation> </message> @@ -37093,6 +37208,11 @@ <source>Alt+P</source> <translation type="unfinished">Alt+P</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="211" /> + <source>Time remaining: {0}</source> + <translation type="unfinished" /> + </message> </context> <context> <name>HgDiffDialog</name> @@ -37273,6 +37393,69 @@ </message> </context> <context> + <name>HgFastexportConfigDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>fastexport Configuration</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the path of the file for the exported marks.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the path of the output file.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Revisions:</source> + <translation type="unfinished">Revisões:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the path of the file containing already exported marks.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Author Map:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Import Marks:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Export Marks:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Output File:</source> + <translation type="unfinished">Ficheiro de Saída:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the revisions, tags or branches to be exported (separated by comma).</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the path of the author map file.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.py" line="42" /> + <source>Text Files (*.txt);;All Files (*)</source> + <translation type="unfinished">Ficheiros de Texto (*.txt);;Ficheiros Todos (*)</translation> + </message> + </context> + <context> <name>HgGpgSignDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="0" /> @@ -38084,7 +38267,7 @@ <translation type="unfinished">Vista</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3049" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3063" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298" /> <source>Select Branches</source> <translation type="unfinished" /> @@ -38125,7 +38308,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2218" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2227" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> <source>Copy Changesets</source> <translation type="unfinished">Copiar Conjuntos de Alterações</translation> @@ -38183,8 +38366,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2312" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2295" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2321" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2304" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="387" /> <source>Switch</source> <translation type="unfinished">Mudar</translation> @@ -38215,263 +38398,270 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2430" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1622" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="415" /> - <source>Pull Changes</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="418" /> - <source>Pull changes from a remote repository</source> - <translation type="unfinished">Puxar alterações do repositorio remoto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="420" /> + <source>Pull Selected Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="419" /> + <source>Pull selected changes from a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="423" /> + <source>Pull All Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="427" /> + <source>Pull all changes from a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="430" /> <source>Pull Large Files</source> <translation>Puxar Ficheiros Grandes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="422" /> - <source>Pull large files for selected revisions</source> - <translation>Puxar os ficheiros grandes das revisões selecionadas</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="428" /> - <source>Push Selected Changes</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="432" /> - <source>Push changes of the selected changeset and its ancestors to a remote repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="439" /> - <source>Push All Changes</source> + <source>Pull large files for selected revisions</source> + <translation>Puxar os ficheiros grandes das revisões selecionadas</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="438" /> + <source>Push Selected Changes</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="442" /> - <source>Push all changes to a remote repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="448" /> - <source>Create Changegroup</source> + <source>Push changes of the selected changeset and its ancestors to a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="449" /> + <source>Push All Changes</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="452" /> + <source>Push all changes to a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="458" /> + <source>Create Changegroup</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="462" /> <source>Create a changegroup file containing the selected changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="455" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="465" /> <source><b>Create Changegroup</b> <p>This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2569" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="468" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2583" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="478" /> <source>Apply Changegroup</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="472" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="482" /> <source>Apply the currently viewed changegroup file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="489" /> <source>Sign Revisions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="483" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="493" /> <source>Add a signature for the selected revisions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="487" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="497" /> <source>Verify Signatures</source> <translation type="unfinished">Verificar Assinaturas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="491" /> - <source>Verify all signatures there may be for the selected revision</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2476" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498" /> - <source>Strip Changesets</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="501" /> + <source>Verify all signatures there may be for the selected revision</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="508" /> + <source>Strip Changesets</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="511" /> <source>Strip changesets from a repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="506" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="516" /> <source>Select All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="509" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="519" /> <source>Deselect All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="958" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="934" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="911" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="885" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="968" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="944" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="921" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="895" /> <source>Mercurial Error</source> <translation>Erro de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1266" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1276" /> <source>{0} (large file)</source> <translation>{0} (ficheiro grande)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1532" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1542" /> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1543" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1553" /> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1701" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1620" /> - <source>Pull Selected Changes</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2570" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2477" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2431" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2313" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2219" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2584" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2491" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2322" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2228" /> <source>The project should be reread. Do this now?</source> <translation>O projecto deve ser recarregado. Fazer-lo agora?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2296" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2305" /> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2341" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2350" /> <source>Define Bookmark</source> <translation type="unfinished">Definir Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2342" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2351" /> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2371" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2380" /> <source>Move Bookmark</source> <translation type="unfinished">Mover marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2372" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2381" /> <source>Select the bookmark to be moved to changeset '{0}':</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2444" /> + <source>Pull Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2727" /> <source>Find Commit</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2714" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728" /> <source>'{0}' was not found.</source> <translation>'{0}' não foi encontrado.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2774" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2788" /> <source>Generating differences ...</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2775" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2789" /> <source>Differences</source> <translation type="unfinished">Diferenças</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2794" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2808" /> <source>No differences available. Get some more log entries.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2796" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2810" /> <source>No differences available.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2807" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2821" /> <source>Differences to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2823" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2837" /> <source>Diff to Parent {0}{1}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2846" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2860" /> <source>There is no difference.</source> <translation type="unfinished">Não há diferenças.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2999" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2983" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2965" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3013" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2997" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2979" /> <source>Save Diff</source> <translation type="unfinished">Gravar Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2967" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2981" /> <source>Patch Files (*.diff)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2984" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2998" /> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3000" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3014" /> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation type="unfinished"><p>O ficheiro remendo <b>{0}</b> não se pôde gravar.<br />Motivo: {1}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3031" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3045" /> <source>closed</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3032" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3046" /> <source>inactive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3041" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3055" /> <source>{0} ({1})</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3050" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3064" /> <source>Select the branches to be shown (none for 'All'):</source> <translation type="unfinished" /> </message> @@ -38620,6 +38810,10 @@ <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation><b>Registo de erros de Mercurial</b><p>Mostra as mensagens possiveis do comando hg log.</p></translation> </message> + <message> + <source>Pull changes from a remote repository</source> + <translation type="vanished">Puxar alterações do repositorio remoto</translation> + </message> </context> <context> <name>HgMergeDialog</name> @@ -38983,208 +39177,213 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="282" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="309" /> + <source>Other Functions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="335" /> <source>Extensions</source> <translation>Extensões</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="718" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="604" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="556" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="451" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="308" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="774" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="659" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="611" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="505" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="361" /> <source>Version Control</source> <translation>Control de Versão</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="734" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="620" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="467" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="324" /> - <source>Commit changes to repository...</source> - <translation>Cometer alterações no repositório...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="742" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="628" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="475" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="332" /> - <source>Add to repository</source> - <translation>Adicionar ao repositorio</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="748" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="481" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="338" /> - <source>Remove from repository (and disk)</source> - <translation>Retirar do repositorio (e disco)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1012" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="999" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="487" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="344" /> - <source>Remove from repository only</source> - <translation>Retirar apenas do repositorio</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="639" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="349" /> - <source>Copy</source> - <translation>Copiar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="641" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="351" /> - <source>Move</source> - <translation>Mover</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="646" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="356" /> - <source>Show log browser</source> - <translation>Mostrar navegador de registos</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="755" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="653" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="494" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="363" /> - <source>Show status</source> - <translation>Mostrar estado</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="762" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="660" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="501" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="370" /> - <source>Show differences</source> - <translation>Mostrar diferenças</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="376" /> - <source>Show differences side-by-side</source> - <translation>Mostrar diferenças lado-a-lado</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="768" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="666" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="507" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="382" /> - <source>Show differences (extended)</source> - <translation>Mostrar diferenças (extendido)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="388" /> - <source>Show differences side-by-side (extended)</source> - <translation>Selecionar para mostrar as diferenças lado-a-lado (extendido)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="394" /> - <source>Show annotated file</source> - <translation>Mostrar ficheiro anotado</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="398" /> - <source>Show annotated file with skip list</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="402" /> - <source>Create skip list file</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="775" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="673" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="514" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="408" /> - <source>Revert changes</source> - <translation>Desfazer alterações</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="779" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="677" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="518" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="412" /> - <source>Conflicts resolved</source> - <translation>Conflitos resolvidos</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="781" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="679" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="520" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="414" /> - <source>Conflicts unresolved</source> - <translation>Conflitos sem resolver</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="783" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="681" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="522" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="416" /> - <source>Re-Merge</source> - <translation>Remesclar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="787" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="685" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="571" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="526" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="420" /> - <source>Select all local file entries</source> - <translation>Selecionar todas as entradas de ficheiros locais</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="790" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="688" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="574" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="529" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="423" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="675" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="521" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="377" /> + <source>Commit changes to repository...</source> + <translation>Cometer alterações no repositório...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="799" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="684" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="530" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="386" /> + <source>Add to repository</source> + <translation>Adicionar ao repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="805" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="690" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="536" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="392" /> + <source>Remove from repository (and disk)</source> + <translation>Retirar do repositorio (e disco)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1069" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1056" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="542" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="398" /> + <source>Remove from repository only</source> + <translation>Retirar apenas do repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="695" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="403" /> + <source>Copy</source> + <translation>Copiar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="697" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="405" /> + <source>Move</source> + <translation>Mover</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="702" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="410" /> + <source>Show log browser</source> + <translation>Mostrar navegador de registos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="812" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="709" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="549" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="417" /> + <source>Show status</source> + <translation>Mostrar estado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="819" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="716" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="556" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="424" /> + <source>Show differences</source> + <translation>Mostrar diferenças</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="430" /> + <source>Show differences side-by-side</source> + <translation>Mostrar diferenças lado-a-lado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="825" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="722" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="562" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="436" /> + <source>Show differences (extended)</source> + <translation>Mostrar diferenças (extendido)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="442" /> + <source>Show differences side-by-side (extended)</source> + <translation>Selecionar para mostrar as diferenças lado-a-lado (extendido)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="448" /> + <source>Show annotated file</source> + <translation>Mostrar ficheiro anotado</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="452" /> + <source>Show annotated file with skip list</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="456" /> + <source>Create skip list file</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="832" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="729" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="569" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="462" /> + <source>Revert changes</source> + <translation>Desfazer alterações</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="836" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="733" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="573" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="466" /> + <source>Conflicts resolved</source> + <translation>Conflitos resolvidos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="735" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="575" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="468" /> + <source>Conflicts unresolved</source> + <translation>Conflitos sem resolver</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="840" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="737" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="577" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="470" /> + <source>Re-Merge</source> + <translation>Remesclar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="844" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="741" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="581" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="474" /> + <source>Select all local file entries</source> + <translation>Selecionar todas as entradas de ficheiros locais</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="847" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="744" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="629" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="584" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="477" /> <source>Select all versioned file entries</source> <translation>Selecionar todas as entradas de ficheiros versionados</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="793" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="691" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="577" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="532" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="426" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="850" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="747" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="632" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="587" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="480" /> <source>Select all local directory entries</source> <translation>Selecionar todas as entradas de diretorios locais</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="797" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="695" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="581" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="536" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="430" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="854" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="751" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="591" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="484" /> <source>Select all versioned directory entries</source> <translation>Selecionar todas as entradas de diretorios versionados</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="801" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="699" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="585" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="540" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="434" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="858" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="755" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="640" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="595" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="488" /> <source>Configure...</source> <translation>Configurar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="916" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="973" /> <source>Create {0} file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="917" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="974" /> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished"><p>O ficheiro <b>{0}</b> já existe. Sobreescrever?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1013" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1000" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1070" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1057" /> <source>Do you really want to remove these files from the repository?</source> <translation>Tem a certeza de que quer retirar estes ficheiros do repositorio?</translation> </message> @@ -39192,1513 +39391,1518 @@ <context> <name>HgProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="126" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="135" /> <source>New from repository</source> <translation>Novo desde repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="128" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="137" /> <source>&New from repository...</source> <translation>&Novo desde repositorio...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="135" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="144" /> <source>Create (clone) a new project from a Mercurial repository</source> <translation /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="138" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="147" /> <source><b>New from repository</b><p>This creates (clones) a new local project from a Mercurial repository.</p></source> <translation><b>Novo desde repositorio</b><p>Cria (clona) um projeto local novo desde um repositorio Mercurial.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="150" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="148" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="159" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="157" /> <source>Show incoming log</source> <translation>Mostrar registo entrante</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="156" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="165" /> <source>Show the log of incoming changes</source> <translation>Mostrar o registo de alterações entrantes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="158" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="167" /> <source><b>Show incoming log</b><p>This shows the log of changes coming into the repository.</p></source> <translation><b>Mostrar registo entrante</b><p>Mostra o registo das alterações entrantes ao repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="170" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="168" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="179" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="177" /> <source>Pull changes</source> <translation>Puxar alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="176" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="185" /> <source>Pull changes from a remote repository</source> <translation>Puxar alterações do repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="178" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="187" /> <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository.</p></source> <translation><b>Puxar alterações</b><p>Puxa alterações do repositorio remoto para o repositorio local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="188" /> - <source>Update from repository</source> - <translation>Atualizar desde o repositorio</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="190" /> - <source>&Update from repository</source> - <translation>At&ualizar desde o repositorio</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="197" /> + <source>Update from repository</source> + <translation>Atualizar desde o repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="199" /> + <source>&Update from repository</source> + <translation>At&ualizar desde o repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="206" /> <source>Update the local project from the Mercurial repository</source> <translation>Atualizar o projeto local desde o repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="200" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="209" /> <source><b>Update from repository</b><p>This updates the local project from the Mercurial repository.</p></source> <translation><b>Atualizar desde o repositorio</b><p>Atualiza o projeto local desde o repositorio Mercurial.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="210" /> - <source>Commit changes to repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="212" /> - <source>&Commit changes to repository...</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="219" /> + <source>Commit changes to repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="221" /> + <source>&Commit changes to repository...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="228" /> <source>Commit changes to the local project to the Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="231" /> <source><b>Commit changes to repository</b><p>This commits changes to the local project to the Mercurial repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="234" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="232" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="243" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="241" /> <source>Show outgoing log</source> <translation>Mostrar registo de saída</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="240" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="249" /> <source>Show the log of outgoing changes</source> <translation>Mostrar o registo de alterações saintes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="242" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251" /> <source><b>Show outgoing log</b><p>This shows the log of changes outgoing out of the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="254" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="252" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261" /> <source>Push changes</source> <translation>Empurrar alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="260" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="269" /> <source>Push changes to a remote repository</source> <translation>Empurra alterações ao repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="262" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271" /> <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> <translation><b>Empurrar alterações</b><p>Empurra as alterações do repositorio local a um repositorio remoto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="274" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="272" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281" /> <source>Push changes (force)</source> <translation>Empurrar alterações (forçar)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="290" /> <source>Push changes to a remote repository with force option</source> <translation>Empurra alterações ao repositorio remoto com a opção force</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="284" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293" /> <source><b>Push changes (force)</b><p>This pushes changes from the local repository to a remote repository using the 'force' option.</p></source> <translation><b>Empurrar alterações (forçar)</b><p>Empurra as alterações do repositorio local a um repositorio remoto usando a opção 'force'.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="294" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="303" /> <source>Export from repository</source> <translation>Exportar do repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="296" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="305" /> <source>&Export from repository...</source> <translation>&Exportar do repositório...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="302" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="311" /> <source>Export a project from the repository</source> <translation>Exportar o projeto do repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="313" /> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation><b>Exportar do repositorio</b><p>Exporta um projeto do repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="313" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="324" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322" /> <source>Show log browser</source> <translation>Mostrar navegador de registos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="331" /> <source>Show a dialog to browse the log of the local project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="334" /> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="336" /> - <source>Show differences</source> - <translation>Mostrar diferenças</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="338" /> - <source>Show &difference</source> - <translation>Mostrar &diferenças</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="345" /> + <source>Show differences</source> + <translation>Mostrar diferenças</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347" /> + <source>Show &difference</source> + <translation>Mostrar &diferenças</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="354" /> <source>Show the difference of the local project to the repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="357" /> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="360" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="358" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="369" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="367" /> <source>Show differences (extended)</source> <translation>Mostrar diferenças (extendido)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="367" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376" /> <source>Show the difference of revisions of the project to the repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="370" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379" /> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="380" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389" /> <source>Show status</source> <translation>Mostrar estado</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="391" /> <source>Show &status...</source> <translation>Mostrar e&stado...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="397" /> <source>Show the status of the local project</source> <translation type="unfinished">Mostrar estado do projeto local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390" /> - <source><b>Show status</b><p>This shows the status of the local project.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="399" /> - <source>Show Summary</source> - <translation>Mostrar Sumário</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="401" /> - <source>Show summary...</source> - <translation>Mostrar sumário...</translation> + <source><b>Show status</b><p>This shows the status of the local project.</p></source> + <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408" /> + <source>Show Summary</source> + <translation>Mostrar Sumário</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="410" /> + <source>Show summary...</source> + <translation>Mostrar sumário...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="417" /> <source>Show summary information of the working directory status</source> <translation>Mostrar informação sumária do estado do diretorio de trabalho</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="411" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420" /> <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> <translation><b>Mostrar sumário</b><p>Mostra alguma informação sumária do estado do diretorio de trabalho.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="430" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="430" /> <source>Show heads</source> <translation>Mostrar cabeçalhos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="432" /> <source>Show the heads of the repository</source> <translation>Mostrar os cabeçalhos do repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="425" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="434" /> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="434" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="443" /> <source>Show parents</source> <translation>Mostrar pais</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="441" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450" /> <source>Show the parents of the repository</source> <translation>Mostrar os pais do repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="443" /> - <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="452" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="452" /> + <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461" /> <source>Show tip</source> <translation>Mostrar dica</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="463" /> <source>Show the tip of the repository</source> <translation>Mostrar a dica do repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="456" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="465" /> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462" /> - <source>Revert changes</source> - <translation>Desfazer alterações</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464" /> - <source>Re&vert changes</source> - <translation>&Desfazer alterações</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471" /> + <source>Revert changes</source> + <translation>Desfazer alterações</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="473" /> + <source>Re&vert changes</source> + <translation>&Desfazer alterações</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="480" /> <source>Revert all changes made to the local project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483" /> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2110" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2129" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492" /> <source>Merge</source> <translation>Mesclar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="485" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494" /> <source>Mer&ge changes...</source> <translation>&Mesclar alterações...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501" /> <source>Merge changes of a revision into the local project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="495" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="504" /> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="506" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505" /> - <source>Commit Merge</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512" /> - <source>Commit all the merged changes.</source> - <translation type="unfinished" /> - </message> - <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="515" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514" /> + <source>Commit Merge</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521" /> + <source>Commit all the merged changes.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="523" /> <source><b>Commit a merge</b><p>This commits a merge working directory</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="523" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="533" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="532" /> <source>Abort Merge</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="531" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540" /> <source>Abort an uncommitted merge and lose all changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="543" /> <source><b>Abort uncommitted merge</b><p>This aborts an uncommitted merge causing all changes to be lost.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="546" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="544" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="553" /> <source>Re-Merge</source> <translation>Remesclar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="553" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="562" /> <source>Re-Merge all conflicting, unresolved files of the project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="556" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="565" /> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="575" /> <source>Show conflicts</source> <translation>Mostrar conflitos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="576" /> <source>Show conflicts...</source> <translation>Mostrar conflitos...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="583" /> <source>Show a dialog listing all files with conflicts</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586" /> <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596" /> <source>Conflicts resolved</source> <translation type="unfinished">Conflitos resolvidos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="597" /> <source>Con&flicts resolved</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604" /> <source>Mark all conflicts of the local project as resolved</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="607" /> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617" /> <source>Conflicts unresolved</source> <translation>Conflitos sem resolver</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625" /> <source>Mark all conflicts of the local project as unresolved</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628" /> <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638" /> <source>Tag in repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640" /> <source>&Tag in repository...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="637" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646" /> <source>Tag the local project in the repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="639" /> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648" /> - <source>List tags</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="649" /> - <source>List tags...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655" /> - <source>List tags of the project</source> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657" /> - <source><b>List tags</b><p>This lists the tags of the project.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663" /> - <source>List branches</source> - <translation>Listar ramos</translation> + <source>List tags</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="658" /> + <source>List tags...</source> + <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="664" /> - <source>List branches...</source> - <translation>Listar ramos...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670" /> - <source>List branches of the project</source> - <translation>Listar os ramos do projeto</translation> + <source>List tags of the project</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666" /> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672" /> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation><b>Listar ramos</b><p>Lista os ramos do projeto.</p></translation> + <source>List branches</source> + <translation>Listar ramos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673" /> + <source>List branches...</source> + <translation>Listar ramos...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="679" /> + <source>List branches of the project</source> + <translation>Listar os ramos do projeto</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681" /> - <source>Create branch</source> - <translation>Criar ramo</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="683" /> - <source>Create &branch...</source> - <translation>Criar &ramo...</translation> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation><b>Listar ramos</b><p>Lista os ramos do projeto.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="690" /> + <source>Create branch</source> + <translation>Criar ramo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692" /> + <source>Create &branch...</source> + <translation>Criar &ramo...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699" /> <source>Create a new branch for the local project in the repository</source> <translation>Criar um ramo novo para o projeto local no repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="693" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="702" /> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation><b>Criar ramo</b><p>Cria um ramo novo para o projeto local no repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712" /> <source>Push new branch</source> <translation>Empurrar ramo novo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721" /> <source>Push the current branch of the local project as a new named branch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="717" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726" /> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="738" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736" /> <source>Close branch</source> <translation>Fechar ramo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="745" /> <source>Close the current branch of the local project</source> <translation>Fechar o ramo atual no projeto local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748" /> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation><b>Fechar ramo</b><p>Fecha o ramo atual do projeto local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="758" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757" /> <source>Show current branch</source> <translation>Mostrar ramo atual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="756" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765" /> <source>Show the current branch of the project</source> <translation>Mostrar o ramo atual do projeto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="759" /> - <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> - <translation><b>Mostrar ramo atual</b><p>Mostra o ramo atual do projeto.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768" /> - <source>Switch</source> - <translation>Mudar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770" /> - <source>S&witch...</source> - <translation>M&udar...</translation> + <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> + <translation><b>Mostrar ramo atual</b><p>Mostra o ramo atual do projeto.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777" /> + <source>Switch</source> + <translation>Mudar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="779" /> + <source>S&witch...</source> + <translation>M&udar...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786" /> <source>Switch the working directory to another revision</source> <translation>Mudar o diretorio de trabalho a outra revisão</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="780" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="789" /> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation><b>Mudar</b><p>Muda o diretorio de trabalho a outra revisão.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799" /> <source>Cleanup</source> <translation>Limpar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799" /> <source>Cleanu&p</source> <translation>Lim&par</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="792" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801" /> <source>Cleanup the local project</source> <translation>Limpar o projeto local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794" /> - <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> - <translation><b>Limpar</b><p>Realiza uma limpeza ao projeto local.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="803" /> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation><b>Limpar</b><p>Realiza uma limpeza ao projeto local.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="812" /> <source>Execute command</source> <translation>Executar comando</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813" /> <source>E&xecute command...</source> <translation>E&xecutar comando...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="811" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="820" /> <source>Execute an arbitrary Mercurial command</source> <translation>Executa um comando de Mercurial arbitrário</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="814" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="823" /> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation><b>Executar comando</b><p>Abre uma caixa de diálogo para introduzir um comando Mercurial arbitrário.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="824" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833" /> <source>Configure</source> <translation>Configurar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="834" /> <source>Configure...</source> <translation>Configurar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="841" /> <source>Show the configuration dialog with the Mercurial page selected</source> <translation>Mostrar a caixa de diálogo de configuração com a página de Mercurial selecionada</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="835" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="844" /> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation><b>Configurar</b><p>Mostra a caixa de diálogo de configuração com a página de Mercurial selecionada.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854" /> <source>Edit user configuration</source> <translation>Editar configuração de usuário</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855" /> <source>Edit user configuration...</source> <translation>Editar configuração de usuário...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="862" /> <source>Show an editor to edit the user configuration file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="856" /> - <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865" /> + <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874" /> <source>Edit repository configuration</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875" /> <source>Edit repository configuration...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="873" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882" /> <source>Show an editor to edit the repository configuration file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="876" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885" /> <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895" /> <source>Show combined configuration settings</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896" /> <source>Show combined configuration settings...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="894" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903" /> <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909" /> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919" /> <source>Show paths</source> <translation>Mostrar rotas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="911" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="920" /> <source>Show paths...</source> <translation>Mostrar rotas...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="918" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="927" /> <source>Show the aliases for remote repositories</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="921" /> - <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930" /> - <source>Verify repository</source> - <translation>Verificar repositorio</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="931" /> - <source>Verify repository...</source> - <translation>Verificar repositorio...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937" /> - <source>Verify the integrity of the repository</source> - <translation>Verificar a integridade do repositorio</translation> + <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> + <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="939" /> - <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> - <translation><b>Verificar repositorio</b><p>Verifica a integridade do repositorio.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="948" /> - <source>Recover</source> - <translation>Recuperar</translation> + <source>Verify repository</source> + <translation>Verificar repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="940" /> + <source>Verify repository...</source> + <translation>Verificar repositorio...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="946" /> + <source>Verify the integrity of the repository</source> + <translation>Verificar a integridade do repositorio</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="948" /> + <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> + <translation><b>Verificar repositorio</b><p>Verifica a integridade do repositorio.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="957" /> + <source>Recover</source> + <translation>Recuperar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="957" /> <source>Recover...</source> <translation>Recuperar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="951" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960" /> <source>Recover from an interrupted transaction</source> <translation>Recuperar duma transação interrompida</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="954" /> - <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> - <translation><b>Recuperar</b><p>Recupera de uma transação interrompida.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="963" /> - <source>Identify</source> - <translation>Identificar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964" /> - <source>Identify...</source> - <translation>Identificar...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="970" /> - <source>Identify the project directory</source> - <translation>Identificar o diretorio do projeto</translation> + <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> + <translation><b>Recuperar</b><p>Recupera de uma transação interrompida.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="972" /> + <source>Identify</source> + <translation>Identificar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973" /> + <source>Identify...</source> + <translation>Identificar...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979" /> + <source>Identify the project directory</source> + <translation>Identificar o diretorio do projeto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="981" /> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation><b>Identificar</b><p>Identifica o diretorio do projeto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="981" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="990" /> <source>Create .hgignore</source> <translation>Criar .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="989" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="998" /> <source>Create a .hgignore file with default values</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="992" /> - <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001" /> - <source>Create changegroup</source> - <translation type="unfinished">Criar conjunto de alterações</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1003" /> - <source>Create changegroup...</source> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010" /> + <source>Create changegroup</source> + <translation type="unfinished">Criar conjunto de alterações</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1012" /> + <source>Create changegroup...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1019" /> <source>Create changegroup file collecting changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1013" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1022" /> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1023" /> - <source>Preview changegroup</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1025" /> - <source>Preview changegroup...</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032" /> + <source>Preview changegroup</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1034" /> + <source>Preview changegroup...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041" /> <source>Preview a changegroup file containing a collection of changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044" /> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2244" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1045" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2263" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054" /> <source>Apply changegroups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1047" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056" /> <source>Apply changegroups...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063" /> <source>Apply one or several changegroup files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066" /> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1067" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076" /> <source>Mark as "good"</source> <translation>Marcar como "bom"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1077" /> <source>Mark as "good"...</source> <translation>Marcar como "bom"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1075" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1084" /> <source>Mark a selectable changeset as good</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1078" /> - <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1087" /> - <source>Mark as "bad"</source> - <translation>Marcar como "mau"</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088" /> - <source>Mark as "bad"...</source> - <translation>Marcar como "mau"...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1094" /> - <source>Mark a selectable changeset as bad</source> + <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1096" /> - <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> + <source>Mark as "bad"</source> + <translation>Marcar como "mau"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1097" /> + <source>Mark as "bad"...</source> + <translation>Marcar como "mau"...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103" /> + <source>Mark a selectable changeset as bad</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105" /> + <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1114" /> <source>Skip</source> <translation>Saltar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1114" /> <source>Skip...</source> <translation>Saltar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1107" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116" /> <source>Skip a selectable changeset</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1109" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118" /> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1115" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1115" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124" /> <source>Reset</source> <translation>Restablecer</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1117" /> - <source>Reset the bisect search data</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119" /> - <source><b>Reset</b><p>This resets the bisect search data.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1126" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1125" /> + <source>Reset the bisect search data</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128" /> + <source><b>Reset</b><p>This resets the bisect search data.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1135" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134" /> <source>Back out changeset</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1142" /> <source>Back out changes of an earlier changeset</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1145" /> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1145" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1155" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154" /> <source>Rollback last transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1152" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161" /> <source>Rollback the last transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1163" /> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1176" /> - <source>Serve project repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1177" /> - <source>Serve project repository...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183" /> - <source>Serve the project repository</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185" /> + <source>Serve project repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1186" /> + <source>Serve project repository...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1192" /> + <source>Serve the project repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1194" /> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2301" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1194" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1203" /> <source>Import Patch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1196" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1205" /> <source>Import Patch...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1202" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211" /> <source>Import a patch from a patch file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1204" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1213" /> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1214" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1223" /> <source>Export Patches</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1225" /> <source>Export Patches...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1222" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1231" /> <source>Export revisions to patch files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1224" /> - <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233" /> - <source>Change Phase</source> - <translation type="unfinished">Mudar Fase</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234" /> - <source>Change Phase...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1240" /> - <source>Change the phase of revisions</source> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1242" /> + <source>Change Phase</source> + <translation type="unfinished">Mudar Fase</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1243" /> + <source>Change Phase...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1249" /> + <source>Change the phase of revisions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251" /> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2343" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1804" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1253" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2362" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1822" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1262" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1260" /> <source>Copy Changesets</source> <translation type="unfinished">Copiar Conjuntos de Alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1259" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1268" /> <source>Copies changesets from another branch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1261" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270" /> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1273" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1272" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1282" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1281" /> <source>Continue Copying Session</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1280" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1289" /> <source>Continue the last copying session after conflicts were resolved</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1283" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1292" /> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1294" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1293" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1303" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1302" /> <source>Stop Copying Session</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1310" /> <source>Stop the interrupted copying session</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1304" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1313" /> <source><b>Stop Copying Session</b><p>This stops the interrupted copying session.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1314" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1313" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1323" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1322" /> <source>Abort Copying Session</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1321" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330" /> <source>Abort the interrupted copying session and rollback</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1324" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1333" /> <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1334" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1343" /> <source>Add</source> <translation>Adicionar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1336" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1345" /> <source>Add...</source> <translation>Adicionar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1342" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1351" /> <source>Add a sub-repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1344" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1353" /> <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1350" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1359" /> <source>Remove</source> <translation>Retirar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1352" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1361" /> <source>Remove...</source> <translation>Retirar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1358" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367" /> <source>Remove sub-repositories</source> <translation>Retirar sub repositorios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1360" /> - <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> - <translation><b>Retirar...</b><p>Retira sub repositorios do projeto.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1369" /> - <source>Create unversioned archive</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1371" /> - <source>Create unversioned archive...</source> - <translation type="unfinished" /> + <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> + <translation><b>Retirar...</b><p>Retira sub repositorios do projeto.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1378" /> + <source>Create unversioned archive</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1380" /> + <source>Create unversioned archive...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1387" /> <source>Create an unversioned archive from the repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1381" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1390" /> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1391" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1400" /> <source>List bookmarks</source> <translation>Listar marcadores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1393" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1402" /> <source>List bookmarks...</source> <translation>Listar marcadores...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1399" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1408" /> <source>List bookmarks of the project</source> <translation>Listar marcadores do projeto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1401" /> - <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> - <translation><b>Listar marcadores</b><p>Lista os marcadores do projeto.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1410" /> - <source>Define bookmark</source> - <translation>Definir marcador</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1412" /> - <source>Define bookmark...</source> - <translation>Definir marcador...</translation> + <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> + <translation><b>Listar marcadores</b><p>Lista os marcadores do projeto.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1419" /> + <source>Define bookmark</source> + <translation>Definir marcador</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1421" /> + <source>Define bookmark...</source> + <translation>Definir marcador...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1428" /> <source>Define a bookmark for the project</source> <translation>Definir um marcador para o projeto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1422" /> - <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> - <translation><b>Definir marcador</b><p>Define um marcador para o projeto.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1431" /> - <source>Delete bookmark</source> - <translation>Apagar marcador</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1433" /> - <source>Delete bookmark...</source> - <translation>Apagar Marcador...</translation> + <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> + <translation><b>Definir marcador</b><p>Define um marcador para o projeto.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1440" /> + <source>Delete bookmark</source> + <translation>Apagar marcador</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1442" /> + <source>Delete bookmark...</source> + <translation>Apagar Marcador...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1449" /> <source>Delete a bookmark of the project</source> <translation>Apagar um marcador do projeto </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1443" /> - <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> - <translation><b>Apagar marcador</b><p>Apaga um marcador do projeto.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1452" /> - <source>Rename bookmark</source> - <translation>Renomear marcador</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1454" /> - <source>Rename bookmark...</source> - <translation>Renomear marcador...</translation> + <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> + <translation><b>Apagar marcador</b><p>Apaga um marcador do projeto.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1461" /> + <source>Rename bookmark</source> + <translation>Renomear marcador</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1463" /> + <source>Rename bookmark...</source> + <translation>Renomear marcador...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1470" /> <source>Rename a bookmark of the project</source> <translation>Renomear um marcador do projeto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1464" /> - <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> - <translation><b>Renomear marcador</b><p>Renomeia um marcador do projeto</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1473" /> + <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> + <translation><b>Renomear marcador</b><p>Renomeia um marcador do projeto</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1482" /> <source>Move bookmark</source> <translation>Mover marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1475" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1484" /> <source>Move bookmark...</source> <translation>Mover marcador...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1481" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1490" /> <source>Move a bookmark of the project</source> <translation>Mover um marcador do projeto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1483" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1492" /> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1495" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1493" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1504" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1502" /> <source>Show incoming bookmarks</source> <translation>Mostrar marcadores entrantes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1502" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1511" /> <source>Show a list of incoming bookmarks</source> <translation>Mostrar uma lista de marcadores entrantes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1505" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1514" /> <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> <translation><b>Mostrar marcadores entrantes</b><p>Mostra uma lista de marcadores novos disponíveis no repositório remoto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1517" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1515" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1526" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1524" /> <source>Pull bookmark</source> <translation>Puxar marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1524" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1533" /> <source>Pull a bookmark from a remote repository</source> <translation>Puxa um marcador desde um repositório remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1527" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1536" /> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation><b>Puxar marcador</b><p>Puxa (pull) um marcador desde um repositório remoto para o repositório local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1539" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1537" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1548" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1546" /> <source>Pull current bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1546" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1555" /> <source>Pull the current bookmark from a remote repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1549" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1558" /> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1560" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1558" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1569" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1567" /> <source>Show outgoing bookmarks</source> <translation>Mostrar marcadores saintes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1567" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1576" /> <source>Show a list of outgoing bookmarks</source> <translation>Mostrar a lista de marcadores saintes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1570" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1579" /> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation><b>Mostrar marcadores saintes</b><p>Mostra a lista dos marcadores novos disponíveis no repositório local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1582" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1580" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1591" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1589" /> <source>Push bookmark</source> <translation>Empurrar marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1589" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1598" /> <source>Push a bookmark to a remote repository</source> <translation>Empurrar um marcador a um repositório remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1592" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1601" /> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation><b>Empurrar marcador</b><p>Empurra (push) um marcador do repositório local para o repositório remoto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1604" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1602" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1613" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1611" /> <source>Push current bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1611" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1620" /> <source>Push the current bookmark to a remote repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1614" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1623" /> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1626" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1624" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1635" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1633" /> <source>Push all bookmarks</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1633" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1642" /> <source>Push all bookmarks to a remote repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1636" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1645" /> <source><b>Push all bookmarks</b><p>This pushes all bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1647" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1645" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1656" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1654" /> <source>Delete all backups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1654" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1663" /> <source>Delete all backup bundles stored in the backup area</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1657" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1666" /> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1699" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1708" /> <source>Administration</source> <translation>Administração</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1724" /> - <source>Specials</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1733" /> + <source>Specials</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1742" /> <source>Changegroup Management</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1740" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1749" /> <source>Patch Management</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1746" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1755" /> <source>Bisect</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1754" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1763" /> <source>Tags</source> <translation type="unfinished">Etiquetas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1761" /> - <source>Branches</source> - <translation>Ramos</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1770" /> + <source>Branches</source> + <translation>Ramos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1779" /> <source>Bookmarks</source> <translation>Marcadores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1791" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1800" /> + <source>Other Functions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1809" /> <source>Extensions</source> <translation>Extensões</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1813" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1831" /> <source>Sub-Repository</source> <translation /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1818" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1836" /> <source>Merge Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1903" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1901" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1922" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1920" /> <source>Mercurial</source> <translation>Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2054" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2073" /> <source>Pull</source> <translation>Puxar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2391" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2375" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2360" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2344" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2323" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2302" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2245" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2055" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2410" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2394" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2379" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2363" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2342" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2321" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2264" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2074" /> <source>The project should be reread. Do this now?</source> <translation>O projecto deve ser recarregado. Fazer-lo agora?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2322" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2341" /> <source>Revert Changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2359" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2378" /> <source>Copy Changesets (Continue)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2374" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2393" /> <source>Copy Changesets (Stop)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2390" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2409" /> <source>Copy Changesets (Abort)</source> <translation type="unfinished" /> </message> @@ -40706,7 +40910,7 @@ <context> <name>HgPurgeListDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/HgPurgeListDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/HgPurgeListDialog.ui" line="0" /> <source>Purge List</source> <translation>Lista de Purga</translation> </message> @@ -41876,87 +42080,87 @@ <context> <name>HgShelveBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Mercurial Shelve Browser</source> <translation>Navegador de Pilhas Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Name</source> <translation>Nome</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Age</source> <translation>Idade</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Message</source> <translation>Mensagem</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Statistics</source> <translation>Estatísticas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>File</source> <translation>Ficheiro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Changes</source> <translation>Alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Lines added</source> <translation>Linhas adicionadas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Lines deleted</source> <translation>Linhas apagadas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Errors</source> <translation>Erros</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source><b>Mercurial shelve errors</b><p>This shows possible error messages of the hg shelve command.</p></source> <translation><b>Erros de pilha Mercurial</b><p>Mostra as mensagens de erro possíveis do comando hg shelve.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="58" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="58" /> <source>&Refresh</source> <translation>Atualiza&r</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="60" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="60" /> <source>Press to refresh the list of shelves</source> <translation>Pressionar para atualizar a lista de pilhas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="69" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="69" /> <source>Restore selected shelve</source> <translation>Restaurar pilhas selecionadas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="72" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="72" /> <source>Delete selected shelves</source> <translation>Apagar pilhas selecionadas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="75" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="75" /> <source>Delete all shelves</source> <translation>Apagar todas as Pilhas</translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="290" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="290" /> <source>%n file(s) changed</source> <translation> <numerusform>um ficheiro alterado</numerusform> @@ -41964,7 +42168,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="292" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="292" /> <source>%n line(s) inserted</source> <translation> <numerusform>uma linha inserida</numerusform> @@ -41972,7 +42176,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="295" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="295" /> <source>%n line(s) deleted</source> <translation> <numerusform>uma linha apagada</numerusform> @@ -41983,57 +42187,57 @@ <context> <name>HgShelveDataDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Shelve</source> <translation>Pilha</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Name:</source> <translation>Nome:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Enter a name for the shelve</source> <translation>Introduzir um nome para a pilha</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Date, Time:</source> <translation>Data, Hora:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Enter the commit date and time for the shelve</source> <translation>Introduzir a data e hora de cometido para a pilha</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>yyyy-MM-dd HH:mm</source> <translation>dd-MM-yyyy HH:mm</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Message:</source> <translation>Mensagem:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Enter a message for the shelve</source> <translation>Introduzir a mensagem da pilha</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Mark new/missing files as added/removed</source> <translation>Marcar ficheiros novos/desaparecidos como adicionados/retirados</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Select to shelve, but keep the changes in the working directory</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Shelve, but keep changes</source> <translation type="unfinished" /> </message> @@ -42041,7 +42245,7 @@ <context> <name>HgShelvesSelectionDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelvesSelectionDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelvesSelectionDialog.ui" line="0" /> <source>Mercurial Shelve Selection</source> <translation>Seleção de Pilha Mercurial</translation> </message> @@ -42345,124 +42549,60 @@ <context> <name>HgStripDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Strip Changesets</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> <source>&Revision</source> - <translation type="unfinished">&Revisão</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to specify a revision by number</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">&Revisão</translation> + </message> + <message> <source>Number</source> - <translation type="unfinished">Número</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Número</translation> + </message> + <message> <source>Enter a revision number</source> - <translation type="unfinished">Introduzir um número de revisão</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to specify a revision by changeset id</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Introduzir um número de revisão</translation> + </message> + <message> <source>Id:</source> - <translation type="unfinished">Id:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Id:</translation> + </message> + <message> <source>Enter a changeset id</source> - <translation type="unfinished">Introduzir um id do conjunto de alterações</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Introduzir um id do conjunto de alterações</translation> + </message> + <message> <source>Select to specify a revision by a tag</source> - <translation type="unfinished">Selecionar para especificar uma revisão por uma etiqueta</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Selecionar para especificar uma revisão por uma etiqueta</translation> + </message> + <message> <source>Tag:</source> - <translation type="unfinished">Etiqueta:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Etiqueta:</translation> + </message> + <message> <source>Enter a tag name</source> - <translation type="unfinished">Introduzir o nome da etiqueta</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Introduzir o nome da etiqueta</translation> + </message> + <message> <source>Select to specify a revision by a branch</source> - <translation type="unfinished">Selecionar para especificar uma revisão por ramo</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Selecionar para especificar uma revisão por ramo</translation> + </message> + <message> <source>Branch:</source> - <translation type="unfinished">Ramo:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Ramo:</translation> + </message> + <message> <source>Enter a branch name</source> - <translation type="unfinished">Introduzir um nome de ramo</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Introduzir um nome de ramo</translation> + </message> + <message> <source>Expression:</source> - <translation type="unfinished">Expressão:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enter a revision set expression</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Expressão:</translation> + </message> + <message> <source>Bookmark:</source> - <translation type="unfinished">Marcador:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Marcador:</translation> + </message> + <message> <source>Enter a bookmark name</source> - <translation type="unfinished">Introduzir um nome de marcador</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to enforce removal of changesets</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enforce Operation</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to not create backup bundles</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>No Backup</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to keep the current working directory state</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Keep Working Directory</source> - <translation type="unfinished" /> + <translation type="vanished">Introduzir um nome de marcador</translation> </message> </context> <context> @@ -42971,29 +43111,118 @@ </message> </context> <context> + <name>HgUncommitDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Undo Local Commit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Commit Message</source> + <translation type="unfinished">Mensagem de Cometido</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Enter the log message.</source> + <translation type="unfinished">Introduzir a mensagem de Registo.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source><b>Log Message</b> +<p>Enter the log message for the uncommit action.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Recent commit messages</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Select a recent commit message to use</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Select to allow an empty commit after undoing it.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Allow empty commit after undoing commit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Select to allow undoing the commit with outstanding changes.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Allow undoing commit with outstanding changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Author</source> + <translation type="unfinished">Autor</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Enter author name to override the configured user:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Enter an author name in order to override the configured one</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Select to give date and time information</source> + <translation type="unfinished">Selecionar para dar a informação de data e hora</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Date and Time</source> + <translation type="unfinished">Data e Hora</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Date/Time:</source> + <translation type="unfinished">Data/Hora:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Enter the date and time to be used</source> + <translation type="unfinished">Introduzir a data e hora a usar</translation> + </message> + </context> + <context> <name>HgUnshelveDataDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Mercurial Unshelve</source> <translation>Pilha de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Name:</source> <translation>Nome:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Enter the name of the shelve</source> <translation>Introduzir nome da pilha</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Select to keep the shelved change</source> <translation>Selecionar para manter a alteração empilhada</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Keep shelved change</source> <translation>Manter alteração empilhada</translation> </message> @@ -43063,23 +43292,23 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the GPG extension</source> - <translation type="unfinished">Selecionar para ativar a extensão GPG</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>GPG</source> - <translation type="unfinished">GPG</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the histedit 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>Histedit</source> - <translation type="unfinished" /> + <source>Rebase</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> + <source>Select to activate the queues extension</source> + <translation type="unfinished">Selecionar para ativar a extensão de filas</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> + <source>Queues</source> + <translation type="unfinished">Filas</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> @@ -43094,52 +43323,42 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the Purge extension</source> - <translation type="unfinished">Selecionar para ativar a extensão purgar (Purge)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Purge</source> - <translation type="unfinished">Purgar</translation> + <source>Select to activate the histedit extension</source> + <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the queues extension</source> - <translation type="unfinished">Selecionar para ativar a extensão de filas</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Queues</source> - <translation type="unfinished">Filas</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the rebase extension</source> + <source>Histedit</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Rebase</source> + <source>Select to activate the GPG extension</source> + <translation type="unfinished">Selecionar para ativar a extensão GPG</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> + <source>GPG</source> + <translation type="unfinished">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 shelve extension</source> - <translation type="unfinished">Selecionar para ativar a extensão de pilhas</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Shelve</source> - <translation type="unfinished">Pilha</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the strip extension</source> + <source>Fastexport</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Strip</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> @@ -43359,35 +43578,51 @@ <translation type="unfinished">Padrão</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="527" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="474" /> <source>Delete Host Fingerprint</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="528" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="475" /> <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="644" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="591" /> <source>Delete Host Minimum Protocol</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="645" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="592" /> <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="708" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="655" /> <source>Edit User Configuration</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="709" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="656" /> <source>You will loose all changes made in this dialog. Shall the data be saved first?</source> <translation type="unfinished" /> </message> + <message> + <source>Select to activate the Purge extension</source> + <translation type="vanished">Selecionar para ativar a extensão purgar (Purge)</translation> + </message> + <message> + <source>Purge</source> + <translation type="vanished">Purgar</translation> + </message> + <message> + <source>Select to activate the shelve extension</source> + <translation type="vanished">Selecionar para ativar a extensão de pilhas</translation> + </message> + <message> + <source>Shelve</source> + <translation type="vanished">Pilha</translation> + </message> </context> <context> <name>HgUserConfigHostFingerprintDialog</name> @@ -43463,17 +43698,17 @@ <context> <name>HgUtilities</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="130" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="132" /> <source>The hg process finished with the exit code {0}</source> <translation type="unfinished">O processo hg terminou com o código de saída {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="134" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="136" /> <source>The hg process did not finish within 30s.</source> <translation type="unfinished">O processo hg não acabou em 30s.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="138" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="140" /> <source>Could not start the hg executable.</source> <translation type="unfinished">Não se pôde iniciar o executável hg.</translation> </message> @@ -50777,13 +51012,13 @@ <name>Lexers</name> <message> <location filename="../QScintilla/Lexers/__init__.py" line="412" /> - <location filename="../Preferences/__init__.py" line="599" /> + <location filename="../Preferences/__init__.py" line="598" /> <source>Python Files (*.py *.py3)</source> <translation type="unfinished">Ficheiros Python (*.py *.py3)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="505" /> - <location filename="../Preferences/__init__.py" line="602" /> + <location filename="../Preferences/__init__.py" line="601" /> <source>Python3 Files (*.py)</source> <translation>Ficheiros Python3 (*.py)</translation> </message> @@ -52623,8 +52858,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> @@ -53983,7 +54218,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> @@ -60228,74 +60463,12 @@ </message> <message> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to install the selected package</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to install the selected package to the user site</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to show details for the selected entry</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Toggle to show or hide the search window</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Package</source> + <source>Press to refresh the lists</source> <translation type="unfinished" /> </message> <message> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Enter the search term for the package name</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Enter search term</source> - <translation type="unfinished">Introduzir o termo de pesquisa</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to start the search</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to search for more packages</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Version</source> - <translation type="unfinished">Versão</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Released</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Description</source> - <translation type="unfinished">Descrição</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to refresh the lists</source> + <source>Press to install a package.</source> <translation type="unfinished" /> </message> <message> @@ -60315,6 +60488,17 @@ </message> <message> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Press to show details for the selected entry</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Press to remove leftovers of an upgrade or uninstall run.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> <source>Select to show only locally-installed packages</source> <translation type="unfinished" /> </message> @@ -60358,6 +60542,13 @@ <message> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Package</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> <source>Installed</source> <translation type="unfinished" /> </message> @@ -60452,319 +60643,337 @@ <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="199" /> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Search Package:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Enter package name to search for.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Press to open a web browser for searching.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="83" /> <source>pip Menu</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="233" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="113" /> <source>Author:</source> <translation type="unfinished">Autor:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="234" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="114" /> <source>Author Email:</source> <translation type="unfinished">Correio Eletrónico do Autor:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="235" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="115" /> <source>Classifiers:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="236" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="116" /> <source>Entry Points:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="237" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="117" /> <source>Files:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="238" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="118" /> <source>Homepage:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="239" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="119" /> <source>Installer:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="240" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="120" /> <source>License:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="241" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="121" /> <source>Location:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="242" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="122" /> <source>Metadata Version:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="243" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="123" /> <source>Name:</source> <translation type="unfinished">Nome:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="244" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="124" /> <source>Project URLs:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="245" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="125" /> <source>Requires:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="246" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="126" /> <source>Required By:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="247" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="127" /> <source>Summary:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="248" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="128" /> <source>Version:</source> <translation type="unfinished">Versão:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="450" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="335" /> <source>Getting installed packages...</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="478" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="363" /> <source>Getting outdated packages...</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1231" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1051" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1038" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1002" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="735" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="729" /> + <source>Cleanup Environment</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="730" /> + <source>The environment cleanup was successful.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="736" /> + <source>Some leftover package directories could not been removed. Delete them manually.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="834" /> <source>Search PyPI</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1003" /> - <source><p>Received an error while searching for <b>{0}</b>.</p><p>Error: {1}</p></source> - <translation type="unfinished" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="835" /> + <source><p>No package details info for <b>{0}</b> available.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="854" /> + <source>Pip</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="856" /> + <source>Install Pip</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="859" /> + <source>Install Pip to User-Site</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="862" /> + <source>Repair Pip</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="869" /> + <source>Install</source> + <translation type="unfinished">Instalar</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1048" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="871" /> + <source>Install Packages</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="874" /> + <source>Install Local Package</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="877" /> + <source>Re-Install Selected Packages</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="884" /> + <source>Requirements/Constraints</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="886" /> + <source>Install Requirements</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="889" /> + <source>Uninstall Requirements</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="892" /> + <source>Generate Requirements...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="896" /> + <source>Install from 'pyproject.toml'</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="900" /> + <source>Uninstall from 'pyproject.toml'</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="905" /> + <source>Generate Constraints...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="912" /> + <source>Cache</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="914" /> + <source>Show Cache Info...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="917" /> + <source>Show Cached Files...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="920" /> + <source>Remove Cached Files...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="923" /> + <source>Purge Cache...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="940" /> + <source>Show Licenses...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="944" /> + <source>Check Vulnerabilities</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="948" /> + <source>Update Vulnerability Database</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="952" /> + <source>Create SBOM file</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="959" /> + <source>Edit User Configuration...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="962" /> + <source>Edit Environment Configuration...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="967" /> + <source>Configure...</source> + <translation type="unfinished">Configurar...</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1211" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1198" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1187" /> + <source>Edit Configuration</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1212" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1199" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1188" /> + <source>No valid configuration path determined. Aborting</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1421" /> + <source>{0} {1}</source> + <comment>package name, package version</comment> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1442" /> + <source>Affected Version:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1445" /> + <source>Advisory:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1580" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1555" /> + <source>unknown</source> + <translation type="unfinished">desconhecido</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1577" /> + <source>any</source> + <translation type="unfinished" /> + </message> + <message> + <source>Enter search term</source> + <translation type="vanished">Introduzir o termo de pesquisa</translation> + </message> + <message> + <source>Version</source> + <translation type="vanished">Versão</translation> + </message> + <message> + <source>Description</source> + <translation type="vanished">Descrição</translation> </message> <message numerus="yes"> - <location filename="../PipInterface/PipPackagesWidget.py" line="1018" /> <source>%n package(s) found.</source> - <translation type="unfinished"> + <translation type="vanished"> <numerusform /> <numerusform /> </translation> </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1025" /> - <source>Showing first {0} packages found.</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1044" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1039" /> - <source><p>There were no results for <b>{0}</b>.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1052" /> - <source><p>There were no more results for <b>{0}</b>.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1232" /> - <source><p>No package details info for <b>{0}</b> available.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1251" /> - <source>Pip</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1253" /> - <source>Install Pip</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1256" /> - <source>Install Pip to User-Site</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1259" /> - <source>Repair Pip</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1266" /> - <source>Install</source> - <translation type="unfinished">Instalar</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1445" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1268" /> - <source>Install Packages</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1271" /> - <source>Install Local Package</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1274" /> - <source>Re-Install Selected Packages</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1281" /> - <source>Requirements/Constraints</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1283" /> - <source>Install Requirements</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1286" /> - <source>Uninstall Requirements</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1289" /> - <source>Generate Requirements...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1293" /> - <source>Install from 'pyproject.toml'</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1297" /> - <source>Uninstall from 'pyproject.toml'</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1302" /> - <source>Generate Constraints...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1309" /> - <source>Cache</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1311" /> - <source>Show Cache Info...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1314" /> - <source>Show Cached Files...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1317" /> - <source>Remove Cached Files...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1320" /> - <source>Purge Cache...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1337" /> - <source>Show Licenses...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1341" /> - <source>Check Vulnerabilities</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1345" /> - <source>Update Vulnerability Database</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1349" /> - <source>Create SBOM file</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1356" /> - <source>Edit User Configuration...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1359" /> - <source>Edit Environment Configuration...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1364" /> - <source>Configure...</source> - <translation type="unfinished">Configurar...</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1608" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1595" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1584" /> - <source>Edit Configuration</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1609" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1596" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1585" /> - <source>No valid configuration path determined. Aborting</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1818" /> - <source>{0} {1}</source> - <comment>package name, package version</comment> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1839" /> - <source>Affected Version:</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1842" /> - <source>Advisory:</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1977" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1952" /> - <source>unknown</source> - <translation type="unfinished">desconhecido</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1974" /> - <source>any</source> - <translation type="unfinished" /> - </message> </context> <context> <name>PipPackagesWindow</name> @@ -61601,64 +61810,69 @@ <name>PluginRepositoryWidget</name> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="124" /> - <source>Stable</source> - <translation type="unfinished">Estável</translation> + <source>Obsolete</source> + <translation type="unfinished" /> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="125" /> - <source>Unstable</source> - <translation type="unfinished">Instável</translation> + <source>Stable</source> + <translation type="unfinished">Estável</translation> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="126" /> - <source>Obsolete</source> - <translation type="unfinished" /> + <source>Unknown</source> + <translation>Desconhecido</translation> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="127" /> - <source>Unknown</source> - <translation>Desconhecido</translation> - </message> - <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="179" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="139" /> - <source>Update</source> - <translation>Atualizar</translation> + <source>Unstable</source> + <translation type="unfinished">Instável</translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="128" /> + <source>Upgrade Available</source> + <translation type="unfinished" /> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="182" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="145" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="142" /> + <source>Update</source> + <translation>Atualizar</translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="185" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="148" /> <source>Download</source> <translation>Descarregar</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="153" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="156" /> <source>Download & Install</source> <translation type="unfinished" /> </message> <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="191" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="164" /> + <source>Cancel</source> + <translation>Cancelar</translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="170" /> + <source>Install</source> + <translation type="unfinished">Instalar</translation> + </message> + <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="188" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="161" /> - <source>Cancel</source> - <translation>Cancelar</translation> - </message> - <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="167" /> - <source>Install</source> - <translation type="unfinished">Instalar</translation> - </message> - <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="185" /> <source>Download && Install</source> <translation type="unfinished">Descarregar && Instalar</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="191" /> - <source>Close && Install</source> - <translation type="unfinished">Fechar && Instalar</translation> - </message> - <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="194" /> + <source>Close && Install</source> + <translation type="unfinished">Fechar && Instalar</translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="197" /> <source>Close</source> <translation type="unfinished">Fechar</translation> </message> @@ -61710,97 +61924,102 @@ <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="603" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="591" /> <source>Plugins Repository URL Changed</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="604" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="592" /> <source>The URL of the Plugins Repository has changed. Select the "Update" button to get the new repository file.</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="613" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="601" /> <source>Read plugins repository file</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="614" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="602" /> <source><p>The plugins repository file <b>{0}</b> could not be read. Select Update</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="623" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="611" /> <source>No plugin repository file available. Select Update.</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="627" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="615" /> <source>New: <b>{0}</b></source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="629" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="617" /> <source>Local Updates: <b>{0}</b></source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="632" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="620" /> <source>Remote Updates: <b>{0}</b></source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="705" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="673" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="693" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="661" /> <source>Error downloading file</source> <translation type="unfinished">Erro ao descarregar ficheiro</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="706" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="674" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="694" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="662" /> <source><p>Could not download the requested file from {0}.</p><p>Error: {1}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="677" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="665" /> <source>No connection to Internet.</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="849" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="810" /> <source>up-to-date</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="852" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="813" /> <source>new download available</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="856" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="818" /> <source>update installable</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="860" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="823" /> <source>updated download available</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="864" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="828" /> <source>error determining status</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1269" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1239" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1002" /> + <source>{0}. {1}</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1346" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1316" /> <source>Cleanup of Plugin Downloads</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1273" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1242" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1350" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1319" /> <source><p>The plugin download <b>{0}</b> could not be deleted.</p><p>Reason: {1}</p></source> <translation type="unfinished" /> </message> @@ -61808,17 +62027,17 @@ <context> <name>PluginRepositoryWindow</name> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1126" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1203" /> <source>Process Generation Error</source> <translation>Erro na Criação de Processo</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1127" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1204" /> <source><p>Could not start the process.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Não pode começar o processo. <br> Assegurar de que está disponível como <b>{0}</b>.</p></translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1131" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1208" /> <source>OK</source> <translation /> </message> @@ -62195,18 +62414,18 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1908" /> + <location filename="../Preferences/__init__.py" line="1909" /> <source>Export Preferences</source> <translation>Exportar Preferências</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1937" /> - <location filename="../Preferences/__init__.py" line="1910" /> + <location filename="../Preferences/__init__.py" line="1938" /> + <location filename="../Preferences/__init__.py" line="1911" /> <source>Properties File (*.ini);;All Files (*)</source> <translation>Ficheiro de Propriedades (*.ini);;Ficheiros Todos (*)</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1935" /> + <location filename="../Preferences/__init__.py" line="1936" /> <source>Import Preferences</source> <translation>Importar Preferências</translation> </message> @@ -62768,79 +62987,79 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="273" /> + <location filename="../Preferences/ProgramsDialog.py" line="275" /> <source>PyPI Package Management</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="525" /> - <location filename="../Preferences/ProgramsDialog.py" line="522" /> - <location filename="../Preferences/ProgramsDialog.py" line="506" /> - <location filename="../Preferences/ProgramsDialog.py" line="376" /> - <location filename="../Preferences/ProgramsDialog.py" line="309" /> - <location filename="../Preferences/ProgramsDialog.py" line="292" /> + <location filename="../Preferences/ProgramsDialog.py" line="527" /> + <location filename="../Preferences/ProgramsDialog.py" line="524" /> + <location filename="../Preferences/ProgramsDialog.py" line="508" /> + <location filename="../Preferences/ProgramsDialog.py" line="378" /> + <location filename="../Preferences/ProgramsDialog.py" line="311" /> + <location filename="../Preferences/ProgramsDialog.py" line="294" /> <source>(unknown)</source> <translation>(desconhecido)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="296" /> + <location filename="../Preferences/ProgramsDialog.py" line="298" /> <source>Spell Checker - PyEnchant</source> <translation>Corretor Ortográfico - PyEnchant</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="313" /> + <location filename="../Preferences/ProgramsDialog.py" line="315" /> <source>Source Highlighter - Pygments</source> <translation>Realçador de Fonte - Pygments</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="320" /> + <location filename="../Preferences/ProgramsDialog.py" line="322" /> <source>MicroPython - MPY Cross Compiler</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="327" /> + <location filename="../Preferences/ProgramsDialog.py" line="329" /> <source>MicroPython - ESP Tool</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="338" /> + <location filename="../Preferences/ProgramsDialog.py" line="340" /> <source>MicroPython - PyBoard Flasher</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="348" /> + <location filename="../Preferences/ProgramsDialog.py" line="350" /> <source>MicroPython - STLink Info</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="358" /> + <location filename="../Preferences/ProgramsDialog.py" line="360" /> <source>MicroPython - STLink Flasher</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="380" /> + <location filename="../Preferences/ProgramsDialog.py" line="382" /> <source>Code Assistant - Jedi</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="460" /> + <location filename="../Preferences/ProgramsDialog.py" line="462" /> <source>(not configured)</source> <translation>(não configurado)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="495" /> + <location filename="../Preferences/ProgramsDialog.py" line="497" /> <source>(module not found)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="528" /> + <location filename="../Preferences/ProgramsDialog.py" line="530" /> <source>(not executable)</source> <translation>(não executável)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="574" /> + <location filename="../Preferences/ProgramsDialog.py" line="576" /> + <location filename="../Preferences/ProgramsDialog.py" line="544" /> <location filename="../Preferences/ProgramsDialog.py" line="542" /> - <location filename="../Preferences/ProgramsDialog.py" line="540" /> <source>(not found)</source> <translation>(não encontrado)</translation> </message> @@ -67047,7 +67266,7 @@ <translation /> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="306" /> + <location filename="../Project/PropertiesDialog.py" line="312" /> <location filename="../Project/PropertiesDialog.py" line="71" /> <source>None</source> <translation type="unfinished" /> @@ -67073,12 +67292,12 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="261" /> + <location filename="../Project/PropertiesDialog.py" line="267" /> <source>Source Files ({0});;All Files (*)</source> <translation>Ficheiros Fonte ({0});;Ficheiros Todos (*)</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="265" /> + <location filename="../Project/PropertiesDialog.py" line="271" /> <source>All Files (*)</source> <translation type="unfinished">Ficheiros Todos (*)</translation> </message> @@ -67119,22 +67338,22 @@ <context> <name>Purge</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="76" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/purge.py" line="83" /> <source>Purge All Files</source> <translation>Purgar Todos os Ficheiros</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="77" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/purge.py" line="84" /> <source>Do really want to delete all files not tracked by Mercurial (including ignored ones)?</source> <translation>Tem a certeza de que quer apagar todos os ficheiros não rastreados por Mercurial (incluindo os ignorados)?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="82" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/purge.py" line="89" /> <source>Purge Files</source> <translation>Purgar Ficheiros</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="83" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/purge.py" line="90" /> <source>Do really want to delete files not tracked by Mercurial?</source> <translation>Tem a certeza de que quer apagar os ficheiros não rastreados por Mercurial?</translation> </message> @@ -67142,79 +67361,115 @@ <context> <name>PurgeProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="36" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="34" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="36" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="34" /> <source>Purge Files</source> <translation type="unfinished">Purgar Ficheiros</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="43" /> - <source>Delete files and directories not known to Mercurial</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="46" /> - <source><b>Purge Files</b><p>This deletes files and directories not known to Mercurial. That means that purge will delete:<ul><li>unknown files (marked with "not tracked" in the status dialog)</li><li>empty directories</li></ul>Note that ignored files will be left untouched.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="61" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="60" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="43" /> + <source>Delete not version controlled files and directories</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="46" /> + <source><b>Purge Files</b><p>This deletes not version controlled files and directories. That means that purge will delete:<ul><li>not version controlled files (marked with "not tracked" in the status dialog)</li><li>empty directories</li></ul>Note that ignored files will be left untouched.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="61" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="60" /> <source>Purge All Files</source> <translation type="unfinished">Purgar Todos os Ficheiros</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="68" /> - <source>Delete files and directories not known to Mercurial including ignored ones</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="74" /> - <source><b>Purge All Files</b><p>This deletes files and directories not known to Mercurial. That means that purge will delete:<ul><li>unknown files (marked with "not tracked" in the status dialog)</li><li>empty directories</li><li>ignored files and directories</li></ul></p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="89" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="68" /> + <source>Delete not version controlled files and directories including ignored ones</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="74" /> + <source><b>Purge All Files</b><p>This deletes not version controlled files and directories. That means that purge will delete:<ul><li>not version controlled files (marked with "not tracked" in the status dialog)</li><li>empty directories</li><li>ignored files and directories</li></ul></p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="90" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="89" /> + <source>Purge Ignored Files</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="97" /> + <source>Delete ignored files and directories</source> + <translation type="unfinished" /> + </message> + <message> + <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/PurgeExtension/ProjectHelper.py" line="91" /> + <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/PurgeExtension/ProjectHelper.py" line="98" /> - <source>List files and directories not known to Mercurial</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="101" /> - <source><b>List Files to be Purged</b><p>This lists files and directories not known to Mercurial. These would be deleted by the "Purge Files" menu entry.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="111" /> + <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="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="131" /> <source>List All Files to be Purged</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="112" /> + <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/PurgeExtension/ProjectHelper.py" line="119" /> - <source>List files and directories not known to Mercurial including ignored ones</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="125" /> - <source><b>List All Files to be Purged</b><p>This lists files and directories not known to Mercurial 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/PurgeExtension/ProjectHelper.py" line="163" /> + <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="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="156" /> + <source>List Ignored Files to be Purged</source> + <translation type="unfinished" /> + </message> + <message> + <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="164" /> + <source>List ignored files and directories</source> + <translation type="unfinished" /> + </message> + <message> + <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="206" /> <source>Purge</source> <translation type="unfinished">Purgar</translation> </message> @@ -76060,49 +76315,49 @@ <context> <name>Shelve</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="105" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="105" /> <source>Shelve current changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="151" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="151" /> <source>Restore shelved changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="170" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="170" /> <source>Abort restore operation</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="191" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="191" /> <source>Continue restore operation</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="211" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="211" /> <source>Select the shelves to be deleted:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="231" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="222" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="231" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="222" /> <source>Delete shelves</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="223" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="223" /> <source>Do you really want to delete these shelves?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="249" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="242" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="249" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="242" /> <source>Delete all shelves</source> <translation>Apagar todas as Pilhas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="243" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="243" /> <source>Do you really want to delete all shelved changes?</source> <translation type="unfinished" /> </message> @@ -76110,21 +76365,21 @@ <context> <name>ShelveProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="62" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="57" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="52" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="47" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="62" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="57" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="52" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="47" /> <source>Shelve changes</source> <translation>Alterações de Pilha</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="122" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="74" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="122" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="74" /> <source>Shelve</source> <translation>Pilha</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="104" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="104" /> <source>The project should be reread. Do this now?</source> <translation>O projecto deve ser recarregado. Fazer-lo agora?</translation> </message> @@ -76132,154 +76387,154 @@ <context> <name>ShelveProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="34" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="34" /> <source>Shelve changes</source> <translation type="unfinished">Alterações de Pilha</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="35" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="35" /> <source>Shelve changes...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="42" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="42" /> <source>Shelve all current changes of the project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="45" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="45" /> <source><b>Shelve changes</b><p>This shelves all current changes of the project.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="54" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="54" /> <source>Show shelve browser</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="55" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="55" /> <source>Show shelve browser...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="61" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="61" /> <source>Show a dialog with all shelves</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="63" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="63" /> <source><b>Show shelve browser...</b><p>This shows a dialog listing all available shelves. Actions on these shelves may be executed via the context menu.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="74" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="74" /> <source>Restore shelved change</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="75" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="75" /> <source>Restore shelved change...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="82" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="82" /> <source>Restore a shelved change to the project directory</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="85" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="85" /> <source><b>Restore shelved change</b><p>This restore a shelved change to the project directory.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="95" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="95" /> <source>Abort restore</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="96" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="96" /> <source>Abort restore...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="103" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="103" /> <source>Abort the restore operation in progress</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="106" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="106" /> <source><b>Abort restore</b><p>This aborts the restore operation in progress and reverts already applied changes.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="116" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="116" /> <source>Continue restore</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="117" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="117" /> <source>Continue restore...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="124" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="124" /> <source>Continue the restore operation in progress</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="127" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="127" /> <source><b>Continue restore</b><p>This continues the restore operation in progress.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="136" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="136" /> <source>Delete shelved changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="137" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="137" /> <source>Delete shelved changes...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="144" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="144" /> <source><b>Delete shelved changes...</b><p>This opens a dialog to select the shelved changes to delete and deletes the selected ones.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="155" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="154" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="155" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="154" /> <source>Delete ALL shelved changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="162" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="162" /> <source><b>Delete ALL shelved changes</b><p>This deletes all shelved changes.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="231" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="202" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="231" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="202" /> <source>Shelve</source> <translation type="unfinished">Pilha</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="218" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="218" /> <source>The project should be reread. Do this now?</source> <translation type="unfinished">O projecto deveria ser relido. Fazer-lo agora?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="244" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="244" /> <source>Unshelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="251" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="251" /> <source>Abort Unshelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="258" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="258" /> <source>Continue Unshelve</source> <translation type="unfinished" /> </message> @@ -78907,44 +79162,6 @@ </message> </context> <context> - <name>Strip</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/strip.py" line="68" /> - <source>Stripping changesets from repository</source> - <translation type="unfinished" /> - </message> - </context> - <context> - <name>StripProjectHelper</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="37" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="35" /> - <source>Strip changesets</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="43" /> - <source>Strip changesets from a repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="45" /> - <source><b>Strip changesets</b><p>This deletes a changeset and all its descendants from a repository. Each removed changeset will be stored in .hg/strip-backup as a bundle file.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="91" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="79" /> - <source>Strip</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="92" /> - <source>The project should be reread. Do this now?</source> - <translation type="unfinished" /> - </message> - </context> - <context> <name>SubstyleDefinitionDialog</name> <message> <location filename="../Preferences/SubstyleDefinitionDialog.py" line="44" /> @@ -80045,12 +80262,12 @@ <context> <name>SvnDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="165" /> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="168" /> <source>Process Generation Error</source> <translation>Erro na Criação de Processo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="166" /> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="169" /> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Não pôde iniciar {0}.<br>Certifique-se de que está na rota de pesquisa.</translation> </message> @@ -90490,6 +90707,66 @@ </message> </context> <context> + <name>Uncommit</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/uncommit.py" line="64" /> + <source>Undo Local Commit</source> + <translation type="unfinished" /> + </message> + </context> + <context> + <name>UncommitProjectBrowserHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="145" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="82" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="72" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="62" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="52" /> + <source>Undo Local Commit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="96" /> + <source>Uncommit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="126" /> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished">O projecto deve ser recarregado. Fazer-lo agora?</translation> + </message> + </context> + <context> + <name>UncommitProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="107" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="38" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="36" /> + <source>Undo Local Commit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="44" /> + <source>Undo the effect of a local commit.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="46" /> + <source><b>Undo Local Commit</b><p>This undoes the effect of a local commit, returning the affected files to their uncommitted state.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="79" /> + <source>Uncommit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="95" /> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished">O projecto deve ser recarregado. Fazer-lo agora?</translation> + </message> + </context> + <context> <name>UnittestExecutor</name> <message> <location filename="../Testing/Interfaces/UnittestExecutor.py" line="52" /> @@ -91136,7 +91413,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7892" /> + <location filename="../UI/UserInterface.py" line="7893" /> <location filename="../UI/UserInterface.py" line="1955" /> <location filename="../UI/UserInterface.py" line="1948" /> <source>Load session</source> @@ -92464,8 +92741,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7600" /> - <location filename="../UI/UserInterface.py" line="7581" /> + <location filename="../UI/UserInterface.py" line="7601" /> + <location filename="../UI/UserInterface.py" line="7582" /> <location filename="../UI/UserInterface.py" line="3402" /> <source>Export Keyboard Shortcuts</source> <translation>Exportar Atalhos de Teclado</translation> @@ -92486,7 +92763,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7619" /> + <location filename="../UI/UserInterface.py" line="7620" /> <location filename="../UI/UserInterface.py" line="3421" /> <source>Import Keyboard Shortcuts</source> <translation>Importar Atalhos de Teclado</translation> @@ -93212,169 +93489,169 @@ <translation>Processo '{0}' saiu.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7108" /> - <location filename="../UI/UserInterface.py" line="7046" /> - <location filename="../UI/UserInterface.py" line="7002" /> - <location filename="../UI/UserInterface.py" line="6928" /> - <location filename="../UI/UserInterface.py" line="6864" /> - <source>Documentation Missing</source> - <translation>Falta a Documentação</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="7109" /> <location filename="../UI/UserInterface.py" line="7047" /> <location filename="../UI/UserInterface.py" line="7003" /> <location filename="../UI/UserInterface.py" line="6929" /> <location filename="../UI/UserInterface.py" line="6865" /> + <source>Documentation Missing</source> + <translation>Falta a Documentação</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7110" /> + <location filename="../UI/UserInterface.py" line="7048" /> + <location filename="../UI/UserInterface.py" line="7004" /> + <location filename="../UI/UserInterface.py" line="6930" /> + <location filename="../UI/UserInterface.py" line="6866" /> <source><p>The documentation starting point "<b>{0}</b>" could not be found.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7090" /> - <location filename="../UI/UserInterface.py" line="6972" /> - <source>Documentation</source> - <translation>Documentação</translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="6973" /> - <source><p>The PyQt{0} documentation starting point has not been configured.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="7091" /> + <location filename="../UI/UserInterface.py" line="6973" /> + <source>Documentation</source> + <translation>Documentação</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="6974" /> + <source><p>The PyQt{0} documentation starting point has not been configured.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7092" /> <source><p>The PySide{0} documentation starting point has not been configured.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7270" /> - <location filename="../UI/UserInterface.py" line="7206" /> - <source>Start Web Browser</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../UI/UserInterface.py" line="7207" /> - <source>The eric web browser could not be started.</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="7271" /> + <location filename="../UI/UserInterface.py" line="7207" /> + <source>Start Web Browser</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7208" /> + <source>The eric web browser could not be started.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7272" /> <source><p>The eric web browser is not started.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7317" /> + <location filename="../UI/UserInterface.py" line="7318" /> <source>Open Browser</source> <translation>Abrir Navegador</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7317" /> + <location filename="../UI/UserInterface.py" line="7318" /> <source>Could not start a web browser</source> <translation>Não se pôde iniciar um navegador web</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7621" /> - <location filename="../UI/UserInterface.py" line="7583" /> + <location filename="../UI/UserInterface.py" line="7622" /> + <location filename="../UI/UserInterface.py" line="7584" /> <source>Keyboard Shortcuts File (*.ekj)</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7601" /> + <location filename="../UI/UserInterface.py" line="7602" /> <source><p>The keyboard shortcuts file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7805" /> + <location filename="../UI/UserInterface.py" line="7806" /> <source>Load crash session...</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7808" /> + <location filename="../UI/UserInterface.py" line="7809" /> <source>Clean crash sessions...</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7845" /> - <source>Read Session</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="7846" /> + <source>Read Session</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7847" /> <source><p>The session file <b>{0}</b> could not be read.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7869" /> + <location filename="../UI/UserInterface.py" line="7870" /> <source>Save Session</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7894" /> - <location filename="../UI/UserInterface.py" line="7871" /> + <location filename="../UI/UserInterface.py" line="7895" /> + <location filename="../UI/UserInterface.py" line="7872" /> <source>eric Session Files (*.esj)</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7963" /> - <source>Found Crash Sessions</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="7964" /> + <source>Found Crash Sessions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7965" /> <source>These crash session files were found. Select the one to open. Select 'Cancel' to not open a crash session.</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="8037" /> - <source>Clean stale crash sessions</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="8038" /> + <source>Clean stale crash sessions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8039" /> <source>Do you really want to delete these stale crash session files?</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="8414" /> - <source>Drop Error</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="8415" /> + <source>Drop Error</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8416" /> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> não é um ficheiro.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="8612" /> - <source>Upgrade available</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="8613" /> + <source>Upgrade available</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8614" /> <source><p>A newer version of the <b>eric-ide</b> package is available at <a href="{0}/eric-ide/">PyPI</a>.</p><p>Installed: {1}<br/>Available: <b>{2}</b></p><p>Shall <b>eric-ide</b> be upgraded?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="8661" /> - <source>First time usage</source> - <translation>Usado a primeira vez</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="8662" /> + <source>First time usage</source> + <translation>Usado a primeira vez</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8663" /> <source>eric has not been configured yet. The configuration dialog will be started.</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="8684" /> + <location filename="../UI/UserInterface.py" line="8685" /> <source>Select Workspace Directory</source> <translation>Selecionar o Diretório de Trabalho</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="8852" /> - <source>Unsaved Data Detected</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="8853" /> + <source>Unsaved Data Detected</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8854" /> <source>Some editors contain unsaved data. Shall these be saved?</source> <translation type="unfinished" /> </message> @@ -100361,8 +100638,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>&Browsing History</source> - <translation type="unfinished">Histórico de &Navegação</translation> + <source>Browsing History</source> + <translation type="unfinished" /> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100401,8 +100678,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>&Search History</source> - <translation type="unfinished">Histórico de &Pesquisas</translation> + <source>Search History</source> + <translation type="unfinished" /> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100411,8 +100688,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>Download &History</source> - <translation type="unfinished">Histórico de &Descárregas</translation> + <source>Download History</source> + <translation type="unfinished" /> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100421,7 +100698,7 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>&Cookies</source> + <source>Cookies</source> <translation type="unfinished" /> </message> <message> @@ -100431,7 +100708,7 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>Cached &Web Pages</source> + <source>Cached Web Pages</source> <translation type="unfinished" /> </message> <message> @@ -100441,8 +100718,18 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>Website &Icons</source> - <translation type="unfinished">&Ícones Sitios Web</translation> + <source>Website Icons</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> + <source>Select to clear the website permissions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> + <source>Website Permissions</source> + <translation type="unfinished" /> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100451,8 +100738,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>Saved &Passwords</source> - <translation type="unfinished">&Senhas Gravadas</translation> + <source>Saved Passwords</source> + <translation type="unfinished">Senhas Gravadas</translation> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100461,7 +100748,7 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>&Zoom Settings</source> + <source>Zoom Settings</source> <translation type="unfinished" /> </message> <message> @@ -100469,6 +100756,26 @@ <source>SSL Certificate Error Exceptions</source> <translation type="unfinished" /> </message> + <message> + <source>&Browsing History</source> + <translation type="vanished">Histórico de &Navegação</translation> + </message> + <message> + <source>&Search History</source> + <translation type="vanished">Histórico de &Pesquisas</translation> + </message> + <message> + <source>Download &History</source> + <translation type="vanished">Histórico de &Descárregas</translation> + </message> + <message> + <source>Website &Icons</source> + <translation type="vanished">&Ícones Sitios Web</translation> + </message> + <message> + <source>Saved &Passwords</source> + <translation type="vanished">&Senhas Gravadas</translation> + </message> </context> <context> <name>WebBrowserJavaScriptConsole</name> @@ -101002,6 +101309,16 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/WebBrowserPage.ui" line="0" /> + <source>Select to store website permission settings in memory only.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserPage.ui" line="0" /> + <source>Do not persist website permissions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserPage.ui" line="0" /> <source><p>Select to allow reading from all canvas elements.</p> <p><b>Note:</b> Disable this option to prevent canvas fingerprinting.</p></source> <translation type="unfinished" /> @@ -101415,32 +101732,87 @@ <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="194" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="78" /> + <source><p>Allow <b>{0}</b> to access your location information?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="83" /> + <source><p>Allow <b>{0}</b> to access your microphone?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="89" /> + <source><p>Allow <b>{0}</b> to access your webcam?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="95" /> + <source><p>Allow <b>{0}</b> to access your microphone and webcam?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="100" /> + <source><p>Allow <b>{0}</b> to lock your mouse cursor?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="105" /> + <source><p>Allow <b>{0}</b> to capture video of your desktop?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="111" /> + <source><p>Allow <b>{0}</b> to capture audio and video of your desktop?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="118" /> + <source><p>Allow <b>{0}</b> to show notifications on your desktop?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="124" /> + <source><p>Allow <b>{0}</b> to read from and write to the clipboard?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="130" /> + <source><p>Allow <b>{0}</b> to access fonts stored on this machine?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="269" /> <source>Suspicuous URL detected</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="195" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="270" /> <source><p>The URL <b>{0}</b> was found in the Safe Browsing database.</p>{1}</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="541" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="396" /> + <source>Permission Request</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="636" /> <source>Register Protocol Handler</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="542" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="637" /> <source><p>Allow the Web Site <b>{0}</b> to handle all <b>{1}</b> links?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="631" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="726" /> <source>SSL Info</source> <translation type="unfinished">Informação SSL</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="632" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="727" /> <source>This site does not contain SSL information.</source> <translation type="unfinished">Este sítio não tem informação SSL.</translation> </message> @@ -104035,15 +104407,15 @@ <translation type="unfinished">Analizar sítio atual</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5231" /> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5221" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5248" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5238" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2220" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2218" /> <source>IP Address Report</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5245" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5262" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2232" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2230" /> <source>Domain Report</source> @@ -104070,8 +104442,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5651" /> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5632" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5675" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5656" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2270" /> <source>Export Keyboard Shortcuts</source> <translation type="unfinished" /> @@ -104092,7 +104464,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5671" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5695" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2289" /> <source>Import Keyboard Shortcuts</source> <translation type="unfinished" /> @@ -104342,99 +104714,99 @@ <translation type="unfinished">Motor de Ajuda</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4768" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4785" /> <source>System</source> <translation type="unfinished">Sistema</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4772" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4789" /> <source>ISO</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4775" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4792" /> <source>Unicode</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4778" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4795" /> <source>Windows</source> <translation type="unfinished">Windows</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4781" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4798" /> <source>IBM</source> <translation type="unfinished">IBM</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4784" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4801" /> <source>Apple</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4787" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4804" /> <source>Other</source> <translation type="unfinished">Outro</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4814" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4831" /> <source>Menu Bar</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4819" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4836" /> <source>Bookmarks</source> <translation type="unfinished">Marcadores</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4824" /> - <source>Status Bar</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4839" /> - <source>&Show all</source> - <translation type="unfinished">&Mostrar tudo</translation> - </message> - <message> <location filename="../WebBrowser/WebBrowserWindow.py" line="4841" /> + <source>Status Bar</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4856" /> + <source>&Show all</source> + <translation type="unfinished">&Mostrar tudo</translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4858" /> <source>&Hide all</source> <translation type="unfinished">&Esconder tudo</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5187" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5204" /> <source>VirusTotal Scan</source> <translation type="unfinished">Análise de VirusTotal</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5188" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5205" /> <source><p>The VirusTotal scan could not be scheduled.<p> <p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5222" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5239" /> <source>Enter a valid IPv4 address in dotted quad notation:</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5232" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5249" /> <source>The given IP address is not in dotted quad notation.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5246" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5263" /> <source>Enter a valid domain name:</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5673" /> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5634" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5697" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5658" /> <source>Keyboard Shortcuts File (*.ekj)</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5652" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5676" /> <source><p>The keyboard shortcuts file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished" /> </message> @@ -105538,32 +105910,32 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1383" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1389" /> <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>Pai #{0}</b></td><td></td></tr> <tr><td><b>Conjunto de Alterações</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1955" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1391" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1964" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397" /> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Etiquetas</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1961" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1970" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1403" /> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Marcadores</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1968" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1404" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1977" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1410" /> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Ramos</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1410" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1416" /> <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> @@ -105572,7 +105944,7 @@ <tr><td><b>Hora do Cometido</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1429" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1435" /> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -105589,36 +105961,36 @@ </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1929" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1938" /> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1936" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945" /> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1943" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1952" /> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Dica</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1948" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1957" /> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Conjunto de Alterações</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1975" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1984" /> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Pais</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1981" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990" /> <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>
--- a/src/eric7/i18n/eric7_ru.ts Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/i18n/eric7_ru.ts Tue Jan 14 17:29:56 2025 +0100 @@ -7716,18 +7716,18 @@ <translation>Графика</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="896" /> + <location filename="../Preferences/ConfigurationDialog.py" line="903" /> <location filename="../Preferences/ConfigurationDialog.py" line="228" /> <source>Hex Editor</source> <translation>Hex-редактор</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1129" /> - <location filename="../Preferences/ConfigurationDialog.py" line="1090" /> - <location filename="../Preferences/ConfigurationDialog.py" line="982" /> - <location filename="../Preferences/ConfigurationDialog.py" line="944" /> - <location filename="../Preferences/ConfigurationDialog.py" line="913" /> - <location filename="../Preferences/ConfigurationDialog.py" line="882" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1136" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1097" /> + <location filename="../Preferences/ConfigurationDialog.py" line="989" /> + <location filename="../Preferences/ConfigurationDialog.py" line="951" /> + <location filename="../Preferences/ConfigurationDialog.py" line="920" /> + <location filename="../Preferences/ConfigurationDialog.py" line="889" /> <location filename="../Preferences/ConfigurationDialog.py" line="785" /> <location filename="../Preferences/ConfigurationDialog.py" line="670" /> <location filename="../Preferences/ConfigurationDialog.py" line="235" /> @@ -7745,7 +7745,7 @@ <translation>Просмотр журнала</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1104" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1111" /> <location filename="../Preferences/ConfigurationDialog.py" line="250" /> <source>MicroPython</source> <translation>MicroPython</translation> @@ -7762,8 +7762,9 @@ <translation>Сеть</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1111" /> - <location filename="../Preferences/ConfigurationDialog.py" line="958" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1118" /> + <location filename="../Preferences/ConfigurationDialog.py" line="965" /> + <location filename="../Preferences/ConfigurationDialog.py" line="806" /> <location filename="../Preferences/ConfigurationDialog.py" line="271" /> <source>Network Proxy</source> <translation>Сетевой proxy</translation> @@ -7774,13 +7775,13 @@ <translation>Уведомления</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="927" /> + <location filename="../Preferences/ConfigurationDialog.py" line="934" /> <location filename="../Preferences/ConfigurationDialog.py" line="285" /> <source>PDF Viewer</source> <translation>Просмотр PDF</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="965" /> + <location filename="../Preferences/ConfigurationDialog.py" line="972" /> <location filename="../Preferences/ConfigurationDialog.py" line="292" /> <source>Python Package Management</source> <translation>Менеджер пакетов Python</translation> @@ -7791,7 +7792,7 @@ <translation>Менеджер плагинов</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="806" /> + <location filename="../Preferences/ConfigurationDialog.py" line="813" /> <location filename="../Preferences/ConfigurationDialog.py" line="684" /> <location filename="../Preferences/ConfigurationDialog.py" line="306" /> <source>Printer</source> @@ -7808,13 +7809,13 @@ <translation>Qt</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="813" /> + <location filename="../Preferences/ConfigurationDialog.py" line="820" /> <location filename="../Preferences/ConfigurationDialog.py" line="321" /> <source>Security</source> <translation>Безопасность</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="996" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1003" /> <location filename="../Preferences/ConfigurationDialog.py" line="328" /> <source>Shell</source> <translation>Оболочка</translation> @@ -7830,7 +7831,7 @@ <translation>Шаблоны</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="865" /> + <location filename="../Preferences/ConfigurationDialog.py" line="872" /> <location filename="../Preferences/ConfigurationDialog.py" line="343" /> <source>Tray Starter</source> <translation>Tray Starter</translation> @@ -7846,7 +7847,7 @@ <translation>Отладка</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1003" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1010" /> <location filename="../Preferences/ConfigurationDialog.py" line="698" /> <location filename="../Preferences/ConfigurationDialog.py" line="399" /> <location filename="../Preferences/ConfigurationDialog.py" line="364" /> @@ -7881,14 +7882,14 @@ <translation>Работа с файлами</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1010" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1017" /> <location filename="../Preferences/ConfigurationDialog.py" line="712" /> <location filename="../Preferences/ConfigurationDialog.py" line="413" /> <source>Searching</source> <translation>Поиск</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="848" /> + <location filename="../Preferences/ConfigurationDialog.py" line="855" /> <location filename="../Preferences/ConfigurationDialog.py" line="719" /> <location filename="../Preferences/ConfigurationDialog.py" line="648" /> <location filename="../Preferences/ConfigurationDialog.py" line="420" /> @@ -7896,7 +7897,7 @@ <translation>Проверка орфографии</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1017" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1024" /> <location filename="../Preferences/ConfigurationDialog.py" line="726" /> <location filename="../Preferences/ConfigurationDialog.py" line="427" /> <source>Style</source> @@ -7919,14 +7920,14 @@ <translation>Экспортёры</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1024" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1031" /> <location filename="../Preferences/ConfigurationDialog.py" line="455" /> <source>Autocompletion</source> <translation>Автодополнение</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1045" /> - <location filename="../Preferences/ConfigurationDialog.py" line="1031" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1052" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1038" /> <location filename="../Preferences/ConfigurationDialog.py" line="483" /> <location filename="../Preferences/ConfigurationDialog.py" line="462" /> <source>QScintilla</source> @@ -7940,13 +7941,13 @@ <translation>Jedi</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1038" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1045" /> <location filename="../Preferences/ConfigurationDialog.py" line="476" /> <source>Calltips</source> <translation>Подсказки</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1052" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1059" /> <location filename="../Preferences/ConfigurationDialog.py" line="740" /> <location filename="../Preferences/ConfigurationDialog.py" line="497" /> <source>Highlighters</source> @@ -7959,21 +7960,21 @@ <translation>Ассоциации типов файлов</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1059" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1066" /> <location filename="../Preferences/ConfigurationDialog.py" line="754" /> <location filename="../Preferences/ConfigurationDialog.py" line="511" /> <source>Styles</source> <translation>Стили</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1066" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1073" /> <location filename="../Preferences/ConfigurationDialog.py" line="761" /> <location filename="../Preferences/ConfigurationDialog.py" line="518" /> <source>Keywords</source> <translation>Ключевые слова</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1073" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1080" /> <location filename="../Preferences/ConfigurationDialog.py" line="768" /> <location filename="../Preferences/ConfigurationDialog.py" line="525" /> <source>Properties</source> @@ -7990,7 +7991,7 @@ <translation>Справка</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="820" /> + <location filename="../Preferences/ConfigurationDialog.py" line="827" /> <location filename="../Preferences/ConfigurationDialog.py" line="553" /> <source>Help Documentation</source> <translation>Справочная документация</translation> @@ -8017,12 +8018,12 @@ <translation>Мультипроект</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1136" /> - <location filename="../Preferences/ConfigurationDialog.py" line="1097" /> - <location filename="../Preferences/ConfigurationDialog.py" line="989" /> - <location filename="../Preferences/ConfigurationDialog.py" line="951" /> - <location filename="../Preferences/ConfigurationDialog.py" line="920" /> - <location filename="../Preferences/ConfigurationDialog.py" line="889" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1143" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1104" /> + <location filename="../Preferences/ConfigurationDialog.py" line="996" /> + <location filename="../Preferences/ConfigurationDialog.py" line="958" /> + <location filename="../Preferences/ConfigurationDialog.py" line="927" /> + <location filename="../Preferences/ConfigurationDialog.py" line="896" /> <location filename="../Preferences/ConfigurationDialog.py" line="792" /> <location filename="../Preferences/ConfigurationDialog.py" line="677" /> <location filename="../Preferences/ConfigurationDialog.py" line="602" /> @@ -8041,47 +8042,47 @@ <translation>Web-браузер</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="827" /> + <location filename="../Preferences/ConfigurationDialog.py" line="834" /> <location filename="../Preferences/ConfigurationDialog.py" line="627" /> <source>Appearance</source> <translation>Внешний вид</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="834" /> - <location filename="../Preferences/ConfigurationDialog.py" line="634" /> - <source>eric Web Browser</source> - <translation>Eric web-браузер</translation> - </message> - <message> <location filename="../Preferences/ConfigurationDialog.py" line="841" /> + <location filename="../Preferences/ConfigurationDialog.py" line="634" /> + <source>eric Web Browser</source> + <translation>Eric web-браузер</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationDialog.py" line="848" /> <location filename="../Preferences/ConfigurationDialog.py" line="641" /> <source>VirusTotal Interface</source> <translation>Интерфейс VirusTotal</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1228" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1235" /> <source>Enter search text...</source> <translation>Введите искомый текст...</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1303" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1310" /> <source>Preferences</source> <translation>Предпочтения</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1309" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1316" /> <source>Please select an entry of the list to display the configuration page.</source> <translation>Выберите пункт в списке слева для отображения страницы его настроек.</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1392" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1399" /> <source>Configuration Page Error</source> <translation>Ошибка страницы конфигурации</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1393" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1400" /> <source><p>The configuration page <b>{0}</b> could not be loaded.</p></source> <translation><p>Страница конфигурации <b>{0}</b> не может быть загружена.</p></translation> </message> @@ -10665,12 +10666,12 @@ <translation><p>Удаленная отладка настроена, но не была дана команда для удаленного входа в систему.</p></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="1691" /> + <location filename="../Debugger/DebuggerInterfacePython.py" line="1692" /> <source>Debug Protocol Error</source> <translation>Протокол ошибок отладки</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="1692" /> + <location filename="../Debugger/DebuggerInterfacePython.py" line="1693" /> <source><p>The response received from the debugger backend could not be decoded. Please report this issue with the received data to the eric bugs email address.</p><p>Error: {0}</p><p>Data:<br/>{1}</p></source> <translation><p>Невозможно декодировать ответ, полученный от бэкэнда отладчика. Сообщите об этой проблеме, отправив полученные данные на электронную почту eric bugs.</p><p>Error: {0}</p><p>Data: <br/>{1}</p></translation> </message> @@ -22722,64 +22723,147 @@ </message> </context> <context> + <name>Fastexport</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="183" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="174" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="168" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="159" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="133" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="113" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="57" /> + <source>Mercurial Fastexport</source> + <translation>Mercurial Fastexport</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="58" /> + <source><p>The output file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation><p>Выходной файл <b>{0}</b> уже существует. Перезаписать его?</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="107" /> + <source>Cancel</source> + <translation>Отмена</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="110" /> + <source>%v/%m Changesets</source> + <translation>%v/%m наборов изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="116" /> + <source>Exporting repository (time remaining: {0}) ...</source> + <translation>Экспорт репозитория (оставшееся время: {0}) ...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="134" /> + <source><p>The repository fastexport process sent an error message.</p><p>{0}</p></source> + <translation><p>Процесс fastexport быстрого экспорта репозитория отправил сообщение об ошибке.</p><p>{0}</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="160" /> + <source><p>The repository fastexport process finished successfully.</p></source> + <translation><p>Процесс fastexport быстрого экспорта репозитория успешно завершен.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="169" /> + <source><p>The repository fastexport process was cancelled.</p></source> + <translation><p>Процесс fastexport быстрого экспорта репозитория был отменен.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="175" /> + <source><p>The repository fastexport process finished with exit code <b>{0}</b>.</p></source> + <translation><p> Процесс fastexport быстрого экспорта репозитория завершился с кодом завершения <b>{0}</b>.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="184" /> + <source><p>The repository fastexport process crashed.</p></source> + <translation><p> Процесс fastexport быстрого экспорта репозитория завершился сбоем.</p></translation> + </message> + </context> + <context> + <name>FastexportProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="37" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="35" /> + <source>Export to git</source> + <translation>Экспорт в git</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="44" /> + <source>Export the repository as git fast-import stream.</source> + <translation>Экспорт репозитория в виде потока быстрого импорта git.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="47" /> + <source><b>Export to git</b><p>This exports the repository as a git fast-import stream.</p></source> + <translation><b>Экспорт в git</b><p>Экспорт репозитория в виде потока быстрого импорта git.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="79" /> + <source>Fastexport</source> + <translation>Fastexport</translation> + </message> + </context> + <context> <name>FeaturePermissionBar</name> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="48" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="50" /> <source>{0} wants to use your position.</source> <translation>{0} хочет использовать ваше положение.</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="51" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="53" /> <source>{0} wants to use your microphone.</source> <translation>{0} хочет использовать ваш микрофон.</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="54" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="56" /> <source>{0} wants to use your camera.</source> <translation>{0} хочет использовать вашу камеру.</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="57" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="59" /> <source>{0} wants to use your microphone and camera.</source> <translation>{0} хочет использовать ваши микрофон и камеру.</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="60" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="62" /> <source>{0} wants to lock your mouse.</source> <translation>{0} хочет использовать вашу мышку.</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="61" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="63" /> <source>{0} wants to capture video of your screen.</source> <translation>{0} хочет выполнить захват видео вашего экрана.</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="64" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="66" /> <source>{0} wants to capture audio and video of your screen.</source> <translation>{0} хочет выполнить захват аудио и видео вашего экрана.</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="67" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="69" /> <source>{0} wants to use desktop notifications.</source> <translation>{0} хочет использовать уведомления на рабочем столе.</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="92" /> - <source>Remember</source> - <translation>Запомнить</translation> - </message> - <message> <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="94" /> + <source>Remember</source> + <translation>Запомнить</translation> + </message> + <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="96" /> <source>Allow</source> <translation>Разрешить</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="95" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="97" /> <source>Deny</source> <translation>Отказать</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="120" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="122" /> <source>{0} wants to use an unknown feature.</source> <translation>{0} хочет использовать неизвестную возможность.</translation> </message> @@ -22787,80 +22871,106 @@ <context> <name>FeaturePermissionsDialog</name> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="161" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="143" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="127" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="109" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="93" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="79" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="65" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="49" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="208" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="190" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="170" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="152" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="136" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="118" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="102" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="88" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="74" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="58" /> <source>Host</source> <translation>Хост</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="162" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="144" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="128" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="110" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="94" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="80" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="66" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="50" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="209" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="191" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="171" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="153" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="137" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="119" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="103" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="89" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="75" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="59" /> <source>Permission</source> <translation>Разрешение</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="54" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="63" /> <source>Notifications</source> <translation>Уведомления</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="68" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="77" /> <source>Geolocation</source> <translation>Геолокация</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="82" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="91" /> <source>Microphone</source> <translation>Микрофон</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="96" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="105" /> <source>Camera</source> <translation>Камера</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="114" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="123" /> <source>Microphone && Camera</source> <translation>Микрофон && камера</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="130" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="139" /> <source>Mouse Lock</source> <translation>Блокировка мыши</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="148" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="157" /> <source>Desktop Video</source> <translation>Видео рабочего стола</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="166" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="175" /> <source>Desktop Audio && Video</source> <translation>Аудио && видео рабочего стола</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="181" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="195" /> + <source>Clipboard</source> + <translation>Буфер</translation> + </message> + <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="213" /> + <source>Local Fonts</source> + <translation>Локальные шрифты</translation> + </message> + <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="296" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="253" /> <source>Allow</source> <translation>Разрешить</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="182" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="297" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="254" /> <source>Deny</source> <translation>Отказать</translation> </message> <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="255" /> + <source>Always Ask</source> + <translation>Всегда спрашивать</translation> + </message> + <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="256" /> + <source>Invalid</source> + <translation>Invalid</translation> + </message> + <message> <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.ui" line="0" /> <source>HTML5 Feature Permissions</source> <translation>Изменение прав доступа HTML5</translation> @@ -24734,23 +24844,23 @@ <translation>{0} ({1})</translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="750" /> + <location filename="../UI/FindFileWidget.py" line="749" /> <source>Invalid search expression</source> <translation>Неверное выражение для поиска</translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="751" /> + <location filename="../UI/FindFileWidget.py" line="750" /> <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/FindFileWidget.py" line="878" /> + <location filename="../UI/FindFileWidget.py" line="877" /> <source>{0} / {1}</source> <comment>occurrences / files</comment> <translation>{0} / {1}</translation> </message> <message numerus="yes"> - <location filename="../UI/FindFileWidget.py" line="881" /> + <location filename="../UI/FindFileWidget.py" line="880" /> <source>%n occurrence(s)</source> <translation> <numerusform>%n вхождение</numerusform> @@ -24759,7 +24869,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../UI/FindFileWidget.py" line="882" /> + <location filename="../UI/FindFileWidget.py" line="881" /> <source>%n file(s)</source> <translation> <numerusform>%n файл</numerusform> @@ -24768,44 +24878,44 @@ </translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1081" /> - <location filename="../UI/FindFileWidget.py" line="1056" /> - <location filename="../UI/FindFileWidget.py" line="1042" /> + <location filename="../UI/FindFileWidget.py" line="1080" /> + <location filename="../UI/FindFileWidget.py" line="1055" /> + <location filename="../UI/FindFileWidget.py" line="1041" /> <source>Replace in Files</source> <translation>Заменить в файлах</translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1043" /> + <location filename="../UI/FindFileWidget.py" line="1042" /> <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/FindFileWidget.py" line="1057" /> + <location filename="../UI/FindFileWidget.py" line="1056" /> <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> <message> - <location filename="../UI/FindFileWidget.py" line="1082" /> + <location filename="../UI/FindFileWidget.py" line="1081" /> <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> <message> - <location filename="../UI/FindFileWidget.py" line="1111" /> + <location filename="../UI/FindFileWidget.py" line="1110" /> <source>Open</source> <translation>Открыть</translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1113" /> + <location filename="../UI/FindFileWidget.py" line="1112" /> <source>Copy Path to Clipboard</source> <translation>Копировать путь в буфер обмена</translation> </message> <message> + <location filename="../UI/FindFileWidget.py" line="1116" /> + <source>Select All</source> + <translation>Выделить всё</translation> + </message> + <message> <location filename="../UI/FindFileWidget.py" line="1117" /> - <source>Select All</source> - <translation>Выделить всё</translation> - </message> - <message> - <location filename="../UI/FindFileWidget.py" line="1118" /> <source>Deselect All</source> <translation>Скрыть все</translation> </message> @@ -27000,37 +27110,37 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="91" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="94" /> <source>Additional Output</source> <translation>Дополнительный вывод</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="110" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="113" /> <source>Process canceled.</source> <translation>Процесс прерван.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="124" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="127" /> <source>Process finished successfully.</source> <translation>Процесс успешно завершен.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="126" /> - <source>Process crashed.</source> - <translation>Процесс завершился с ошибкой.</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="129" /> + <source>Process crashed.</source> + <translation>Процесс завершился с ошибкой.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="132" /> <source>Process finished with exit code {0}</source> <translation>Процесс завершился с кодом выхода - {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="195" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="198" /> <source>Process Generation Error</source> <translation>Ошибка при запуске процесса</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="196" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="199" /> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Невозможно запустить процесс {0}. Убедитесь, что он находится в путях поиска.</translation> </message> @@ -35416,456 +35526,456 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="303" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="309" /> <source>Create project repository</source> <translation>Создать репозиторий проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="304" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="310" /> <source>The project repository could not be created.</source> <translation>Невозможно создать репозиторий проекта.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="338" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="344" /> <source>Creating Mercurial repository</source> <translation>Создание Mercurial репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="359" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="365" /> <source>Initial commit to Mercurial repository</source> <translation>Mercurial: Первичная фиксация в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="405" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="411" /> <source>Cloning project from a Mercurial repository</source> <translation>Mercurial: Клонирование проекта из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="516" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="522" /> <source>Commit Changes</source> <translation>Фиксация изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="517" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="523" /> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation>Фиксация влияет на файлы с несохраненными изменениями. Продолжать ли фиксацию?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="580" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="586" /> <source>Committing changes to Mercurial repository</source> <translation>Mercurial: Фиксация изменений в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="679" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="685" /> <source>Synchronizing with the Mercurial repository</source> <translation>Mercurial: Синхронизация с репозиторием</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="719" /> <source>Adding files/directories to the Mercurial repository</source> <translation>Mercurial: Добавление файлов/директорий в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="774" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="780" /> <source>Removing files/directories from the Mercurial repository</source> <translation>Mercurial: Удаление файлов/директорий из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="829" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="835" /> <source>Renaming {0}</source> <translation>Переименование {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="964" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="970" /> <source>Tagging in the Mercurial repository</source> <translation>Mercurial: Добавление тегов в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1011" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1000" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1017" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006" /> <source>Revert changes</source> <translation>Отменить изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1001" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1007" /> <source>Do you really want to revert all changes to these files or directories?</source> <translation>Вы действительно хотите отменить все изменения в этих файлах и директориях?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1012" /> - <source>Do you really want to revert all changes of the project?</source> - <translation>Вы действительно хотите отменить все изменения в проекте?</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1018" /> + <source>Do you really want to revert all changes of the project?</source> + <translation>Вы действительно хотите отменить все изменения в проекте?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1024" /> <source>Reverting changes</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1064" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1070" /> <source>Merging</source> <translation>Слияние</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1095" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1109" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101" /> <source>Re-Merge</source> <translation>Повторить слияние</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1102" /> <source>Do you really want to re-merge these files or directories?</source> <translation>Вы действительно хотите повторить слияние этих файлов или директорий?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1104" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1110" /> <source>Do you really want to re-merge the project?</source> <translation>Вы действительно хотите повторить слияние проекта?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1114" /> <source>Re-Merging</source> <translation>Повторное слияние</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1131" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1137" /> <source>Current branch tip</source> <translation>Конечная ревизия текущей ветки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1314" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1320" /> <source>Mercurial command</source> <translation>Mercurial: Команда</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1492" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1498" /> <source>Copying {0}</source> <translation>Копирование {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1758" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1746" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1764" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1752" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743" /> <source>Mercurial Side-by-Side Difference</source> <translation>Mercurial: Построчный просмотр различий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1759" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1765" /> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>Невозможно прочитать файл <b>{0}</b>.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2457" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2446" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2436" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1835" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2455" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844" /> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1838" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1847" /> <source>Pulling from a remote Mercurial repository</source> <translation>Затягивание изменений из удалённого Mercurial репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1884" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1893" /> <source>Pushing to a remote Mercurial repository</source> <translation>Mercurial: Проталкивание изменений в удалённый репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2027" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2036" /> <source>Marking as 'unresolved'</source> <translation>Помеченные как 'unresolved'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2029" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038" /> <source>Marking as 'resolved'</source> <translation>Помеченные как 'resolved'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2051" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060" /> <source>Aborting uncommitted merge</source> <translation>Отмена незавершенного слияния</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2084" /> <source>Creating branch in the Mercurial repository</source> <translation>Создание ветки в Mercurial репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086" /> - <source>Created new branch <{0}>.</source> - <translation>Создана новая ветка <{0}>.</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2095" /> + <source>Created new branch <{0}>.</source> + <translation>Создана новая ветка <{0}>.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2104" /> <source>Showing current branch</source> <translation>Отображение текущей ветки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2184" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193" /> <source>Verifying the integrity of the Mercurial repository</source> <translation>Mercurial: Проверка целостности репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2200" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209" /> <source>Showing the combined configuration settings</source> <translation>Отображение обобщенных параметров конфигурации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2224" /> <source>Showing aliases for remote repositories</source> <translation>Отображение алиасов удалённых репозиториев</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2230" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239" /> <source>Recovering from interrupted transaction</source> <translation>Восстановление после прерванной транзакции</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254" /> <source>Identifying project directory</source> <translation>Идентификация директории проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2291" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2300" /> <source>Create .hgignore file</source> <translation>Создать файл .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2292" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301" /> <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="2395" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2369" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2351" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2404" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2378" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2360" /> <source>Create changegroup</source> <translation>Создать группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2353" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362" /> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Файлы группы изменений Mercurial (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2370" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2379" /> <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="2409" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2418" /> <source>Preview changegroup</source> <translation>Просмотр группы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2438" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2411" /> - <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> - <translation>Файлы группы изменений Mercurial (*.hg);;Все файлы (*)</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2447" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2420" /> + <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> + <translation>Файлы группы изменений Mercurial (*.hg);;Все файлы (*)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2456" /> <source>Shall the working directory be updated?</source> <translation>Обновить рабочую директорию?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2479" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2488" /> <source>Bisect subcommand ({0}) invalid.</source> <translation>Bisect: Недействительная подкоманда ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2501" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2510" /> <source>Mercurial Bisect ({0})</source> <translation>Mercurial: Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2527" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2536" /> <source>Removing files from the Mercurial repository only</source> <translation>Mercurial: Удаление файлов только из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2576" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2557" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2585" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2566" /> <source>Backing out changeset</source> <translation>Отмена набора изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2558" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2567" /> <source>No revision given. Aborting...</source> <translation>Не задана ревизия. Отмена...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2587" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2602" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2596" /> <source>Rollback last transaction</source> <translation>Откатить последнюю транзакцию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2588" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2597" /> <source>Are you sure you want to rollback the last transaction?</source> <translation>Вы действительно хотите откатить последнюю транзакцию?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2657" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2666" /> <source>Import Patch</source> <translation>Импорт патча</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2707" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2716" /> <source>Export Patches</source> <translation>Экспорт патчей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2749" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2758" /> <source>Change Phase</source> <translation>Изменить фазу</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2804" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813" /> <source>Copy Changesets</source> <translation>Копировать наборы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2843" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2852" /> <source>Copy Changesets (Continue)</source> <translation>Копировать наборы изменений (продолжение)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2853" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2862" /> <source>Copy Changesets (Stop)</source> <translation>Копировать наборы изменений (Stop)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2863" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2872" /> <source>Copy Changesets (Abort)</source> <translation>Копировать наборы изменений (Abort)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2887" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2896" /> <source>Create Unversioned Archive</source> <translation>Создать неверсированный архив</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2902" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2911" /> <source>Delete All Backups</source> <translation>Удалить все резервные копии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2903" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2912" /> <source><p>Do you really want to delete all backup bundles stored in the backup area?<br/><b>{0}</b></p></source> <translation><p>Вы действительно хотите удалить все резервные комплекты, сохраненные в области резервного копирования'?<br/><b>{0}</b></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2994" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2974" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2963" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2983" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2972" /> <source>Add Sub-repository</source> <translation>Добавить субрепозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3033" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2964" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3042" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2973" /> <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="2975" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2984" /> <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="3051" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3060" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3004" /> <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="3050" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3032" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3018" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3059" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3027" /> <source>Remove Sub-repositories</source> <translation>Удалить субрепозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3019" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3028" /> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation><p>Отсутствует файл субрепозиториев .hgsub. Отмена...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3296" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3138" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3147" /> <source>Mercurial Command Server</source> <translation>Mercurial: Сервер команд</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3139" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3148" /> <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="3297" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3321" /> <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="3420" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3444" /> <source>Mercurial Bookmark</source> <translation>Mercurial: Закладка</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3437" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3461" /> <source>Delete Bookmark</source> <translation>Удалить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3438" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3462" /> <source>Select the bookmark to be deleted:</source> <translation>Выберите закладку для удаления:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3449" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3473" /> <source>Delete Mercurial Bookmark</source> <translation>Mercurial: Удалить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3476" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3500" /> <source>Rename Mercurial Bookmark</source> <translation>Mercurial: Переименовать закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3518" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3542" /> <source>Move Mercurial Bookmark</source> <translation>Mercurial: Переместить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3600" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3624" /> <source>Pull Bookmark</source> <translation>Затянуть закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3601" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3625" /> <source>Select the bookmark to be pulled:</source> <translation>Выберите закладку для затягивания:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3613" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3637" /> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>Затянуть закладку из удалённого Mercurial репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3641" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3665" /> <source>Push Bookmark</source> <translation>Протолкнуть закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3642" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3666" /> <source>Select the bookmark to be push:</source> <translation>Выберите закладку для проталкивания:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3657" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3681" /> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Mercurial: Проталкивание закладки в удалённый репозиторий</translation> </message> @@ -36710,42 +36820,42 @@ <context> <name>HgClient</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="98" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="100" /> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Невозможно запустить процесс {0}. Убедитесь, что он находится в путях поиска.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="147" /> - <source>Did not receive the 'hello' message.</source> - <translation>Сообщение 'hello' не получено.</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="149" /> + <source>Did not receive the 'hello' message.</source> + <translation>Сообщение 'hello' не получено.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="151" /> <source>Received data on unexpected channel.</source> <translation>Получены данные по непредвиденному каналу.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="154" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="156" /> <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> <translation>Неправильное 'hello' сообщение, ожидалось 'capabilities: ', а получено '{0}'.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="159" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="161" /> <source>'capabilities' message did not contain any capability.</source> <translation>Сообщение 'capabilities' пусто.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="168" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="170" /> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation>Неправильное 'hello' сообщение, ожидалось 'encoding: ', а получено '{0}'.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="173" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="175" /> <source>'encoding' message did not contain any encoding.</source> <translation>Сообщение 'encoding' пусто.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="385" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="387" /> <source>For message see output dialog.</source> <translation>Сообщение можно увидеть в окне вывода.</translation> </message> @@ -37112,6 +37222,11 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="0" /> + <source>%v/%m</source> + <translation>%v/%m</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="0" /> <source>Errors</source> <translation>Ошибки</translation> </message> @@ -37155,6 +37270,11 @@ <source>Alt+P</source> <translation>Alt+P</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="211" /> + <source>Time remaining: {0}</source> + <translation>Оставшееся время: {0}</translation> + </message> </context> <context> <name>HgDiffDialog</name> @@ -37348,6 +37468,69 @@ </message> </context> <context> + <name>HgFastexportConfigDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>fastexport Configuration</source> + <translation>Конфигурация fastexport</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the path of the file for the exported marks.</source> + <translation>Введите путь к файлу для экспортированных пометок.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the path of the output file.</source> + <translation>Введите путь файла вывода.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Revisions:</source> + <translation>Ревизии:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the path of the file containing already exported marks.</source> + <translation>Введите путь к файлу, содержащему уже экспортированные пометки.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Author Map:</source> + <translation>Карта автора:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Import Marks:</source> + <translation>Импорт пометок:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Export Marks:</source> + <translation>Экспорт пометок:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Output File:</source> + <translation>Файл вывода:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the revisions, tags or branches to be exported (separated by comma).</source> + <translation>Введите ревизии, теги или ветки, которые будут экспортированы (через запятую).</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the path of the author map file.</source> + <translation>Введите путь к файлу авторской карты.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.py" line="42" /> + <source>Text Files (*.txt);;All Files (*)</source> + <translation>Файлы текстовые (*.txt);;Все файлы (*)</translation> + </message> + </context> + <context> <name>HgGpgSignDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="0" /> @@ -38160,7 +38343,7 @@ <translation>Отображение</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3049" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3063" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298" /> <source>Select Branches</source> <translation>Выбрать ветки</translation> @@ -38201,7 +38384,7 @@ <translation>Выберите для отображения ветки из списка закрытых веток и обновите отображение</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2218" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2227" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> <source>Copy Changesets</source> <translation>Копировать наборы изменений</translation> @@ -38259,8 +38442,8 @@ <translation>Закрыть выбранные головные ревизии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2312" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2295" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2321" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2304" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="387" /> <source>Switch</source> <translation>Переключиться</translation> @@ -38291,264 +38474,271 @@ <translation>Переместить закладку в выбранную ревизию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2430" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1622" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="415" /> - <source>Pull Changes</source> - <translation>Затянуть изменения</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="418" /> - <source>Pull changes from a remote repository</source> - <translation>Затянуть изменения из удалённого репозитория</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="420" /> + <source>Pull Selected Changes</source> + <translation>Затянуть выделенные изменения</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="419" /> + <source>Pull selected changes from a remote repository</source> + <translation>Затянуть выбранные изменения из удаленного хранилища</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="423" /> + <source>Pull All Changes</source> + <translation>Затянуть все изменения</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="427" /> + <source>Pull all changes from a remote repository</source> + <translation>Затянуть все изменения из удаленного хранилища</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="430" /> <source>Pull Large Files</source> <translation>Загрузить большие файлы</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="422" /> - <source>Pull large files for selected revisions</source> - <translation>Загрузить (затянуть) большие файлы для выбранных ревизий</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="428" /> - <source>Push Selected Changes</source> - <translation>Протолкнуть выбранные изменения</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="432" /> - <source>Push changes of the selected changeset and its ancestors to a remote repository</source> - <translation>Протолкнуть выбранный набор изменений и его предков в удаленный репозиторий</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="439" /> - <source>Push All Changes</source> - <translation>Протолкнуть все изменения</translation> + <source>Pull large files for selected revisions</source> + <translation>Загрузить (затянуть) большие файлы для выбранных ревизий</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="438" /> + <source>Push Selected Changes</source> + <translation>Протолкнуть выбранные изменения</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="442" /> - <source>Push all changes to a remote repository</source> - <translation>Протолкнуть все изменения в удаленный репозиторий</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="448" /> - <source>Create Changegroup</source> - <translation>Создать группу изменений</translation> + <source>Push changes of the selected changeset and its ancestors to a remote repository</source> + <translation>Протолкнуть выбранный набор изменений и его предков в удаленный репозиторий</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="449" /> + <source>Push All Changes</source> + <translation>Протолкнуть все изменения</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="452" /> + <source>Push all changes to a remote repository</source> + <translation>Протолкнуть все изменения в удаленный репозиторий</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="458" /> + <source>Create Changegroup</source> + <translation>Создать группу изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="462" /> <source>Create a changegroup file containing the selected changesets</source> <translation>Создать файл группы изменений, содержащий выбранные наборы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="455" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="465" /> <source><b>Create Changegroup</b> <p>This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.</p></source> <translation><b>Создать группу изменений</b> <p>Создание файла группы изменений, содержащего выбранные ревизии. Если не выбрано ни одного набора, будут скомплектованы все наборы изменений. Если выбрана одна ревизия, то она будет интерпретирована как базовая ревизия. В противном случае самая младшая ревизия будет использована как базовая ревизия а все остальные изменения будут скомплектованы. Если диалог отображает исходящие наборы изменений, все помеченные наборы изменений будут собраны в комплект.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2569" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="468" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2583" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="478" /> <source>Apply Changegroup</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="472" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="482" /> <source>Apply the currently viewed changegroup file</source> <translation>Применить просматриваемый в настоящее время файл группы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="489" /> <source>Sign Revisions</source> <translation>Подписать ревизию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="483" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="493" /> <source>Add a signature for the selected revisions</source> <translation>Добавить подпись для выбранной ревизии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="487" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="497" /> <source>Verify Signatures</source> <translation>Проверить подписи</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="491" /> - <source>Verify all signatures there may be for the selected revision</source> - <translation>Проверить все подписи, которые могут быть для отмеченных ревизий</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2476" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498" /> - <source>Strip Changesets</source> - <translation>Срезать наборы изменений (strip)</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="501" /> + <source>Verify all signatures there may be for the selected revision</source> + <translation>Проверить все подписи, которые могут быть для отмеченных ревизий</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="508" /> + <source>Strip Changesets</source> + <translation>Срезать наборы изменений (strip)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="511" /> <source>Strip changesets from a repository</source> <translation>Срезать наборы изменений из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="506" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="516" /> <source>Select All Entries</source> <translation>Выбрать все записи</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="509" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="519" /> <source>Deselect All Entries</source> <translation>Снять выделение всех записей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="958" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="934" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="911" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="885" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="968" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="944" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="921" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="895" /> <source>Mercurial Error</source> <translation>Mercurial: Ошибка</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1266" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1276" /> <source>{0} (large file)</source> <translation>{0} большой файл</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1532" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1542" /> <source>Side-by-Side Diff to Parent {0}</source> <translation>Построчные различия с предком {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1543" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1553" /> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation><a href="sbsdiff:{0}_{1}">Построчное сравнение</a></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1701" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1620" /> - <source>Pull Selected Changes</source> - <translation>Затянуть помеченные изменения</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2570" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2477" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2431" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2313" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2219" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2584" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2491" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2322" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2228" /> <source>The project should be reread. Do this now?</source> <translation>Проект должен быть перепрочитан. Сделать это сейчас?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2296" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2305" /> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation>Выберите закладку для переключения (оставьте поле пустым для использования ревизии):</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2341" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2350" /> <source>Define Bookmark</source> <translation>Определить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2342" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2351" /> <source>Enter bookmark name for changeset "{0}":</source> <translation>Введите имя закладки для набора изменений "{0}":</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2371" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2380" /> <source>Move Bookmark</source> <translation>Переместить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2372" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2381" /> <source>Select the bookmark to be moved to changeset '{0}':</source> <translation>Выберите закладку для перемещения в набор изменений '{0}':</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2444" /> + <source>Pull Changes</source> + <translation>Затянуть изменения</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2727" /> <source>Find Commit</source> <translation>Поиск фиксации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2714" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728" /> <source>'{0}' was not found.</source> <translation>'{0}' не найден.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2774" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2788" /> <source>Generating differences ...</source> <translation>Генерация различий...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2775" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2789" /> <source>Differences</source> <translation>Различия</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2794" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2808" /> <source>No differences available. Get some more log entries.</source> - <translation>Различия недоступны. Получите еще несколько записей в журнале.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2796" /> + <translation>Различия недоступны. Получите еще несколько записей из журнала.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2810" /> <source>No differences available.</source> <translation>Различия недоступны.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2807" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2821" /> <source>Differences to Parent {0}</source> <translation>Различия с предком {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2823" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2837" /> <source>Diff to Parent {0}{1}</source> <translation>Различия с предком {0}{1}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2846" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2860" /> <source>There is no difference.</source> <translation>Различий нет.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2999" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2983" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2965" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3013" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2997" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2979" /> <source>Save Diff</source> <translation>Сохранить различия</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2967" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2981" /> <source>Patch Files (*.diff)</source> <translation>Файлы патчей (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2984" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2998" /> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Файл патча <b>{0}</b> уже существует. Переписать?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3000" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3014" /> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation><p>Невозможно сохранить файл патча <b>{0}</b>.<br>Причина: {1}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3031" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3045" /> <source>closed</source> <translation>закрыта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3032" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3046" /> <source>inactive</source> <translation>неактивна</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3041" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3055" /> <source>{0} ({1})</source> <translation>{0} ({1})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3050" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3064" /> <source>Select the branches to be shown (none for 'All'):</source> <translation>Выберите ветки для отображения (не для варианта 'Все'):</translation> </message> @@ -39062,208 +39252,213 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="282" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="309" /> + <source>Other Functions</source> + <translation>Другие функции</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="335" /> <source>Extensions</source> <translation>Расширения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="718" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="604" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="556" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="451" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="308" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="774" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="659" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="611" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="505" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="361" /> <source>Version Control</source> <translation>Контроль версий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="734" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="620" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="467" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="324" /> - <source>Commit changes to repository...</source> - <translation>Фиксировать изменения в репозитории...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="742" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="628" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="475" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="332" /> - <source>Add to repository</source> - <translation>Добавить в репозиторий</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="748" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="481" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="338" /> - <source>Remove from repository (and disk)</source> - <translation>Удалить из репозитория (и с диска)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1012" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="999" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="487" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="344" /> - <source>Remove from repository only</source> - <translation>Удалить только из репозитория</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="639" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="349" /> - <source>Copy</source> - <translation>Копировать</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="641" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="351" /> - <source>Move</source> - <translation>Переместить</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="646" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="356" /> - <source>Show log browser</source> - <translation>Показать журнал истории</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="755" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="653" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="494" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="363" /> - <source>Show status</source> - <translation>Показать статус</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="762" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="660" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="501" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="370" /> - <source>Show differences</source> - <translation>Показать различия</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="376" /> - <source>Show differences side-by-side</source> - <translation>Показать различия построчно</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="768" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="666" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="507" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="382" /> - <source>Show differences (extended)</source> - <translation>Показать различия (подробно)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="388" /> - <source>Show differences side-by-side (extended)</source> - <translation>Показать различия построчно (подробно)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="394" /> - <source>Show annotated file</source> - <translation>Показать аннотированный файл</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="398" /> - <source>Show annotated file with skip list</source> - <translation>Показать аннотированный файл со списком пропуска</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="402" /> - <source>Create skip list file</source> - <translation>Создать файл со списком пропуска</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="775" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="673" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="514" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="408" /> - <source>Revert changes</source> - <translation>Отменить изменения</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="779" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="677" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="518" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="412" /> - <source>Conflicts resolved</source> - <translation>Решенные конфликты</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="781" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="679" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="520" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="414" /> - <source>Conflicts unresolved</source> - <translation>Нерешенные конфликты</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="783" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="681" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="522" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="416" /> - <source>Re-Merge</source> - <translation>Повторить слияние</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="787" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="685" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="571" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="526" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="420" /> - <source>Select all local file entries</source> - <translation>Выделить все локальные файлы</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="790" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="688" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="574" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="529" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="423" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="675" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="521" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="377" /> + <source>Commit changes to repository...</source> + <translation>Фиксировать изменения в репозитории...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="799" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="684" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="530" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="386" /> + <source>Add to repository</source> + <translation>Добавить в репозиторий</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="805" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="690" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="536" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="392" /> + <source>Remove from repository (and disk)</source> + <translation>Удалить из репозитория (и с диска)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1069" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1056" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="542" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="398" /> + <source>Remove from repository only</source> + <translation>Удалить только из репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="695" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="403" /> + <source>Copy</source> + <translation>Копировать</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="697" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="405" /> + <source>Move</source> + <translation>Переместить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="702" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="410" /> + <source>Show log browser</source> + <translation>Показать журнал истории</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="812" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="709" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="549" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="417" /> + <source>Show status</source> + <translation>Показать статус</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="819" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="716" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="556" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="424" /> + <source>Show differences</source> + <translation>Показать различия</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="430" /> + <source>Show differences side-by-side</source> + <translation>Показать различия построчно</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="825" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="722" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="562" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="436" /> + <source>Show differences (extended)</source> + <translation>Показать различия (подробно)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="442" /> + <source>Show differences side-by-side (extended)</source> + <translation>Показать различия построчно (подробно)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="448" /> + <source>Show annotated file</source> + <translation>Показать аннотированный файл</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="452" /> + <source>Show annotated file with skip list</source> + <translation>Показать аннотированный файл со списком пропуска</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="456" /> + <source>Create skip list file</source> + <translation>Создать файл со списком пропуска</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="832" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="729" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="569" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="462" /> + <source>Revert changes</source> + <translation>Отменить изменения</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="836" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="733" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="573" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="466" /> + <source>Conflicts resolved</source> + <translation>Решенные конфликты</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="735" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="575" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="468" /> + <source>Conflicts unresolved</source> + <translation>Нерешенные конфликты</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="840" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="737" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="577" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="470" /> + <source>Re-Merge</source> + <translation>Повторить слияние</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="844" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="741" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="581" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="474" /> + <source>Select all local file entries</source> + <translation>Выделить все локальные файлы</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="847" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="744" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="629" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="584" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="477" /> <source>Select all versioned file entries</source> <translation>Выделить все версированные записи файла</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="793" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="691" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="577" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="532" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="426" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="850" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="747" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="632" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="587" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="480" /> <source>Select all local directory entries</source> <translation>Выделить все локальные записи директории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="797" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="695" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="581" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="536" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="430" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="854" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="751" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="591" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="484" /> <source>Select all versioned directory entries</source> <translation>Выделить все версированные записи директории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="801" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="699" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="585" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="540" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="434" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="858" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="755" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="640" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="595" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="488" /> <source>Configure...</source> <translation>Настроить...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="916" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="973" /> <source>Create {0} file</source> <translation>Создать файл {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="917" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="974" /> <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/ProjectBrowserHelper.py" line="1013" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1000" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1070" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1057" /> <source>Do you really want to remove these files from the repository?</source> <translation>Вы действительно хотите удалить эти файлы из репозитория?</translation> </message> @@ -39271,1513 +39466,1518 @@ <context> <name>HgProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="126" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="135" /> <source>New from repository</source> <translation>Новый из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="128" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="137" /> <source>&New from repository...</source> <translation>&Новый из репозитория...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="135" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="144" /> <source>Create (clone) a new project from a Mercurial repository</source> <translation>Создание (клонирование) нового проекта из Mercurial репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="138" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="147" /> <source><b>New from repository</b><p>This creates (clones) a new local project from a Mercurial repository.</p></source> <translation><b>Новый из репозитория</b><p>Создание (клонирование) нового локального проекта из Mercurial репозитория.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="150" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="148" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="159" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="157" /> <source>Show incoming log</source> <translation>Показать журнал входящих</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="156" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="165" /> <source>Show the log of incoming changes</source> <translation>Показать журнал входящих изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="158" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="167" /> <source><b>Show incoming log</b><p>This shows the log of changes coming into the repository.</p></source> <translation><b>Показать журнал входящих</b><p>Отображение журнала входящих в репозиторий изменений.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="170" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="168" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="179" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="177" /> <source>Pull changes</source> <translation>Затянуть изменения (pull)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="176" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="185" /> <source>Pull changes from a remote repository</source> <translation>Затянуть изменения из удалённого репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="178" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="187" /> <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository.</p></source> <translation><b>Затянуть изменения</b><p>Затягивание изменений из удаленного репозитория в локальный.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="188" /> - <source>Update from repository</source> - <translation>Обновить из репозитория</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="190" /> - <source>&Update from repository</source> - <translation>&Обновить из репозитория</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="197" /> + <source>Update from repository</source> + <translation>Обновить из репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="199" /> + <source>&Update from repository</source> + <translation>&Обновить из репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="206" /> <source>Update the local project from the Mercurial repository</source> <translation>Mercurial: Обновить локальный проект из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="200" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="209" /> <source><b>Update from repository</b><p>This updates the local project from the Mercurial repository.</p></source> <translation><b>Обновить из репозитория</b><p>Обновление локального проекта из Mercurial репозитория.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="210" /> - <source>Commit changes to repository</source> - <translation>Фиксация изменений в репозитории</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="212" /> - <source>&Commit changes to repository...</source> - <translation>&Фиксация изменений в репозитории...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="219" /> + <source>Commit changes to repository</source> + <translation>Фиксация изменений в репозитории</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="221" /> + <source>&Commit changes to repository...</source> + <translation>&Фиксация изменений в репозитории...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="228" /> <source>Commit changes to the local project to the Mercurial repository</source> <translation>Mercurial: Фиксация изменений локального проекта в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="231" /> <source><b>Commit changes to repository</b><p>This commits changes to the local project to the Mercurial repository.</p></source> <translation><b>Фиксация изменений в репозитории</b><p>Фиксация изменений локального проекта в Mercurial репозитории.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="234" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="232" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="243" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="241" /> <source>Show outgoing log</source> <translation>Показать журнал исходящих</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="240" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="249" /> <source>Show the log of outgoing changes</source> <translation>Показать журнал исходящих изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="242" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251" /> <source><b>Show outgoing log</b><p>This shows the log of changes outgoing out of the repository.</p></source> <translation><b>Показать журнал исходящих</b><p>Отображение журнала исходящих из репозитория изменений.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="254" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="252" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261" /> <source>Push changes</source> <translation>Протолкнуть изменения (push)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="260" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="269" /> <source>Push changes to a remote repository</source> <translation>Протолкнуть изменения в удалённый репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="262" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271" /> <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> <translation><b>Протолкнуть изменения</b><p>Передача изменений из локального проекта в удаленный репозиторий.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="274" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="272" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281" /> <source>Push changes (force)</source> <translation>Протолкнуть изменения принудительно (force)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="290" /> <source>Push changes to a remote repository with force option</source> <translation>Протолкнуть изменения в удалённый репозиторий (c опцией force)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="284" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293" /> <source><b>Push changes (force)</b><p>This pushes changes from the local repository to a remote repository using the 'force' option.</p></source> <translation><b>Протолкнуть изменения принудительно (force)</b><p>Передача изменений в удалённый репозиторий с опцией 'force'.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="294" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="303" /> <source>Export from repository</source> <translation>Экспорт из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="296" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="305" /> <source>&Export from repository...</source> <translation>&Экспорт из репозитория...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="302" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="311" /> <source>Export a project from the repository</source> <translation>Экспортировать проект из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="313" /> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation><b>Экспорт из репозитория</b><p>Экспорт проекта из репозитория.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="313" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="324" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322" /> <source>Show log browser</source> <translation>Показать журнал истории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="331" /> <source>Show a dialog to browse the log of the local project</source> <translation>Отображение диалога просмотра журнала локального проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="334" /> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation><b>Показать журнал истории</b><p>Отображение диалога просмотра журнала истории локального проекта. Изначально показывается ограниченное количество записей. Следующие записи могут быть получены дополнительно.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="336" /> - <source>Show differences</source> - <translation>Показать различия</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="338" /> - <source>Show &difference</source> - <translation>Показать &различие</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="345" /> + <source>Show differences</source> + <translation>Показать различия</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347" /> + <source>Show &difference</source> + <translation>Показать &различие</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="354" /> <source>Show the difference of the local project to the repository</source> <translation>Показать различие локального проекта и репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="357" /> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation><b>Показать различия</b><p>Отображение различий локального проекта относительно репозитория.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="360" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="358" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="369" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="367" /> <source>Show differences (extended)</source> <translation>Показать различия (подробно)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="367" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376" /> <source>Show the difference of revisions of the project to the repository</source> <translation>Показать различие ревизий проекта в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="370" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379" /> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation><b>Показать различия (подробно)</b><p>Отображение различий выделеных ревизий проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="380" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389" /> <source>Show status</source> <translation>Показать статус</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="391" /> <source>Show &status...</source> <translation>Показать &статус...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="397" /> <source>Show the status of the local project</source> <translation>Отображение статуса локального проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390" /> - <source><b>Show status</b><p>This shows the status of the local project.</p></source> - <translation><b>Показать статус</b><p>Отображение статуса локального проекта.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="399" /> - <source>Show Summary</source> - <translation>Показать сводку</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="401" /> - <source>Show summary...</source> - <translation>Показать сводку...</translation> + <source><b>Show status</b><p>This shows the status of the local project.</p></source> + <translation><b>Показать статус</b><p>Отображение статуса локального проекта.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408" /> + <source>Show Summary</source> + <translation>Показать сводку</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="410" /> + <source>Show summary...</source> + <translation>Показать сводку...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="417" /> <source>Show summary information of the working directory status</source> <translation>Отображение суммарной информации о статусе рабочей директории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="411" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420" /> <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> <translation><b>Показать сводку</b><p>Отображение суммарной информации о статусе рабочей директории.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="430" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="430" /> <source>Show heads</source> <translation>Показать текущие версии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="432" /> <source>Show the heads of the repository</source> <translation>Показать текущие версии в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="425" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="434" /> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation><b>Показать текущие версии</b><p>Показать текущие версии в репозитории.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="434" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="443" /> <source>Show parents</source> <translation>Показать предков</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="441" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450" /> <source>Show the parents of the repository</source> <translation>Показать предков репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="443" /> - <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> - <translation><b>Показать предков</b><p>Показать предков репозитория.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="452" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="452" /> + <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> + <translation><b>Показать предков</b><p>Показать предков репозитория.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461" /> <source>Show tip</source> <translation>Показать конечную ревизию (tip)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="463" /> <source>Show the tip of the repository</source> <translation>Показать конечную ревизию репозитория (tip)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="456" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="465" /> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation><b>Показать конечную ревизию</b><p>Отображение конечной ревизии (tip) репозитория.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462" /> - <source>Revert changes</source> - <translation>Отменить изменения</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464" /> - <source>Re&vert changes</source> - <translation>От&менить изменения</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471" /> + <source>Revert changes</source> + <translation>Отменить изменения</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="473" /> + <source>Re&vert changes</source> + <translation>От&менить изменения</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="480" /> <source>Revert all changes made to the local project</source> <translation>Отменить все изменения, сделанные в локальном проекте</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483" /> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation><b>Отменить изменения</b><p>Отмена всех изменений, сделанных в локальном проекте.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2110" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2129" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492" /> <source>Merge</source> <translation>Слияние</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="485" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494" /> <source>Mer&ge changes...</source> <translation>С&лить изменения...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501" /> <source>Merge changes of a revision into the local project</source> <translation>Слияние изменений из ревизии с локальным проектом</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="495" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="504" /> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation><b>Слияние</b><p>Слияние изменений из ревизии с локальным проектом.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="506" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="515" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514" /> <source>Commit Merge</source> <translation>Фиксировать слияние</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521" /> <source>Commit all the merged changes.</source> <translation>Фиксировать все объединенные изменения.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="523" /> <source><b>Commit a merge</b><p>This commits a merge working directory</p></source> <translation><b>Фиксировать слияние</b><p>Фиксация слияний рабочей директории</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="523" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="533" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="532" /> <source>Abort Merge</source> <translation>Отменить слияние</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="531" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540" /> <source>Abort an uncommitted merge and lose all changes</source> <translation>Отмена незавершенного слияния и потеря всех изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="543" /> <source><b>Abort uncommitted merge</b><p>This aborts an uncommitted merge causing all changes to be lost.</p></source> <translation><b>Отмена незавершенного слияния</b><p>Отмена незавершенного слияния, приводящая к потере всех изменений.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="546" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="544" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="553" /> <source>Re-Merge</source> <translation>Повторить слияние</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="553" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="562" /> <source>Re-Merge all conflicting, unresolved files of the project</source> <translation>Повторить слияние всех конфликтующих, нерешенных файлов проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="556" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="565" /> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation><b>Повторное слияние</b><p>Повторное слияние всех конфликтующих, нерешенных файлов проекта, без учета всех предыдущих попыток слияния.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="575" /> <source>Show conflicts</source> <translation>Показать конфликты</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="576" /> <source>Show conflicts...</source> <translation>Показать конфликты...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="583" /> <source>Show a dialog listing all files with conflicts</source> <translation>Отображение диалога перечисления всех файлов, содержащих конфликты</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586" /> <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> <translation><b>Показать конфликты</b><p>Отображение диалога перечисления все файлов, содержащих конфликты.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596" /> <source>Conflicts resolved</source> <translation>Решенные конфликты</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="597" /> <source>Con&flicts resolved</source> <translation>Решенные кон&фликты</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604" /> <source>Mark all conflicts of the local project as resolved</source> <translation>Пометить все конфликты локального проекта как решенные</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="607" /> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation><b>Решенные конфликты</b><p>Пометить все конфликты локального проекта как решенные.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617" /> <source>Conflicts unresolved</source> <translation>Нерешенные конфликты</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625" /> <source>Mark all conflicts of the local project as unresolved</source> <translation>Пометить все конфликты локального проекта как нерешенные</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628" /> <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> <translation><b>Нерешенные конфликты</b><p>Пометить все конфликты локального проекта как нерешенные.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638" /> <source>Tag in repository</source> <translation>Тег в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640" /> <source>&Tag in repository...</source> <translation>&Тег в репозитории...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="637" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646" /> <source>Tag the local project in the repository</source> <translation>Тег локального проекта в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="639" /> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation><b>Тег в репозитории</b><p>Теги локального проекта в репозитории.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648" /> - <source>List tags</source> - <translation>Список тегов</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="649" /> - <source>List tags...</source> - <translation>Список тегов...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655" /> - <source>List tags of the project</source> - <translation>Список тегов проекта</translation> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation><b>Тег в репозитории</b><p>Теги локального проекта в репозитории.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657" /> - <source><b>List tags</b><p>This lists the tags of the project.</p></source> - <translation><b>Список тегов</b><p>Отображение списка тегов проекта.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663" /> - <source>List branches</source> - <translation>Список веток</translation> + <source>List tags</source> + <translation>Список тегов</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="658" /> + <source>List tags...</source> + <translation>Список тегов...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="664" /> - <source>List branches...</source> - <translation>Список веток...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670" /> - <source>List branches of the project</source> - <translation>Список веток текущего проекта</translation> + <source>List tags of the project</source> + <translation>Список тегов проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666" /> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <translation><b>Список тегов</b><p>Отображение списка тегов проекта.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672" /> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation><b>Список веток</b><p>Отображение списка веток текущего проекта.</p></translation> + <source>List branches</source> + <translation>Список веток</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673" /> + <source>List branches...</source> + <translation>Список веток...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="679" /> + <source>List branches of the project</source> + <translation>Список веток текущего проекта</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681" /> - <source>Create branch</source> - <translation>Создать ветку</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="683" /> - <source>Create &branch...</source> - <translation>Создать &ветку...</translation> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation><b>Список веток</b><p>Отображение списка веток текущего проекта.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="690" /> + <source>Create branch</source> + <translation>Создать ветку</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692" /> + <source>Create &branch...</source> + <translation>Создать &ветку...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699" /> <source>Create a new branch for the local project in the repository</source> <translation>Создать новую ветку локального проекта в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="693" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="702" /> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation><b>Создать ветку</b><p>Создать новую ветку локального проекта в репозитории.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712" /> <source>Push new branch</source> <translation>Протолкнуть новую ветку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721" /> <source>Push the current branch of the local project as a new named branch</source> <translation>Протолкнуть текущую ветку локального проекта как новую именованную ветку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="717" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726" /> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation><b>Протолкнуть новую ветку</b><p>Передать текущую ветку локального проекта как новую именованную ветку.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="738" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736" /> <source>Close branch</source> <translation>Закрыть ветку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="745" /> <source>Close the current branch of the local project</source> <translation>Закрыть ветку локального проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748" /> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation><b>Закрыть ветку</b><p>Закрытие ветки локального проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="758" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757" /> <source>Show current branch</source> <translation>Показать текущую ветку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="756" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765" /> <source>Show the current branch of the project</source> <translation>Отображение текущей ветки проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="759" /> - <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> - <translation><b>Показать текущую ветку</b><p>Отображение текущей ветки проекта.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768" /> - <source>Switch</source> - <translation>Переключиться</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770" /> - <source>S&witch...</source> - <translation>Пе&реключиться (switch)...</translation> + <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> + <translation><b>Показать текущую ветку</b><p>Отображение текущей ветки проекта.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777" /> + <source>Switch</source> + <translation>Переключиться</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="779" /> + <source>S&witch...</source> + <translation>Пе&реключиться (switch)...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786" /> <source>Switch the working directory to another revision</source> <translation>Переключить рабочую директорию на другую ревизию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="780" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="789" /> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation><b>Переключиться</b><p>Переключение рабочей директории на другую ревизию.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799" /> <source>Cleanup</source> <translation>Очистить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799" /> <source>Cleanu&p</source> <translation>О&чистить (cleanup)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="792" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801" /> <source>Cleanup the local project</source> <translation>Очистить локальный проект</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794" /> - <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> - <translation><b>Очистить</b><p>Выполнение очистки локального проекта.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="803" /> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation><b>Очистить</b><p>Выполнение очистки локального проекта.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="812" /> <source>Execute command</source> <translation>Выполнить команду</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813" /> <source>E&xecute command...</source> <translation>В&ыполнить команду...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="811" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="820" /> <source>Execute an arbitrary Mercurial command</source> <translation>Выполнить произвольную команду Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="814" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="823" /> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation><b>Выполнить команду</b><p>Открытие диалога ввода произвольной команды Mercurial.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="824" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833" /> <source>Configure</source> <translation>Настройки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="834" /> <source>Configure...</source> <translation>Настройки...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="841" /> <source>Show the configuration dialog with the Mercurial page selected</source> <translation>Отображение диалога настроек с выбранной страницей настроек Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="835" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="844" /> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation><b>Настройки</b><p>Отображение диалога настроек с выбранной страницей настроек Mercurial.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854" /> <source>Edit user configuration</source> <translation>Правка конфигурации пользователя</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855" /> <source>Edit user configuration...</source> <translation>Правка конфигурации пользователя...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="862" /> <source>Show an editor to edit the user configuration file</source> <translation>Отображение редактора для правки конфигурации пользователя</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="856" /> - <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> - <translation><b>Правка конфигурации пользователя</b><p>Отображение редактора для правки конфигурации пользователя.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865" /> + <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> + <translation><b>Правка конфигурации пользователя</b><p>Отображение редактора для правки конфигурации пользователя.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874" /> <source>Edit repository configuration</source> <translation>Правка конфигурации репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875" /> <source>Edit repository configuration...</source> <translation>Правка конфигурации репозитория...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="873" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882" /> <source>Show an editor to edit the repository configuration file</source> <translation>Отображение редактора для правки конфигурации репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="876" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885" /> <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation><b>Правка конфигурации репозитория</b><p>Отображение редактора для правки конфигурации репозитория.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895" /> <source>Show combined configuration settings</source> <translation>Показать обобщенные параметры настройки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896" /> <source>Show combined configuration settings...</source> <translation>Показать обобщенные параметры настройки...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="894" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903" /> <source>Show the combined configuration settings from all configuration files</source> <translation>Показать обобщенные параметры настройки из всех конфигурационных файлов</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909" /> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation><b>Показать обобщенные параметры настройки</b><p>Отображение объединенных параметров настройки из всех конфигурационных файлов.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919" /> <source>Show paths</source> <translation>Показать пути</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="911" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="920" /> <source>Show paths...</source> <translation>Показать пути...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="918" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="927" /> <source>Show the aliases for remote repositories</source> <translation>Алиасы для удалённых репозиториев</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="921" /> - <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> - <translation><b>Показать пути</b><p>Показать алиасы для удалённых репозиториев.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930" /> - <source>Verify repository</source> - <translation>Проверить репозиторий</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="931" /> - <source>Verify repository...</source> - <translation>Проверить репозиторий...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937" /> - <source>Verify the integrity of the repository</source> - <translation>Проверить целостность репозитория</translation> + <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> + <translation><b>Показать пути</b><p>Показать алиасы для удалённых репозиториев.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="939" /> - <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> - <translation><b>Проверить целостность репозитория</b><p>Проверить целостность репозитория.</p></translation> + <source>Verify repository</source> + <translation>Проверить репозиторий</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="940" /> + <source>Verify repository...</source> + <translation>Проверить репозиторий...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="946" /> + <source>Verify the integrity of the repository</source> + <translation>Проверить целостность репозитория</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="948" /> + <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> + <translation><b>Проверить целостность репозитория</b><p>Проверить целостность репозитория.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="957" /> <source>Recover</source> <translation>Восстановить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="948" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="957" /> <source>Recover...</source> <translation>Восстановить...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="951" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960" /> <source>Recover from an interrupted transaction</source> <translation>Восстановление после прерванной транзакции</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="954" /> - <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> - <translation><b>Восстановить</b><p>Восстановление после прерванной транзакции.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="963" /> - <source>Identify</source> - <translation>Идентификация</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964" /> - <source>Identify...</source> - <translation>Идентификация...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="970" /> - <source>Identify the project directory</source> - <translation>Идентификация директории проекта</translation> + <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> + <translation><b>Восстановить</b><p>Восстановление после прерванной транзакции.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="972" /> + <source>Identify</source> + <translation>Идентификация</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973" /> + <source>Identify...</source> + <translation>Идентификация...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979" /> + <source>Identify the project directory</source> + <translation>Идентификация директории проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="981" /> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation><b>Идентификация</b><p>Идентификация директории проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="981" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="990" /> <source>Create .hgignore</source> <translation>Создать файл .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="989" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="998" /> <source>Create a .hgignore file with default values</source> <translation>Создать файл .hgignore со значениями по умолчанию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="992" /> - <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> - <translation><b>Создать файл .hgignore</b><p>Создать файл .hgignore со значениями по умолчанию.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001" /> - <source>Create changegroup</source> - <translation>Создать группу изменений</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1003" /> - <source>Create changegroup...</source> - <translation>Создать группу изменений...</translation> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> + <translation><b>Создать файл .hgignore</b><p>Создать файл .hgignore со значениями по умолчанию.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010" /> + <source>Create changegroup</source> + <translation>Создать группу изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1012" /> + <source>Create changegroup...</source> + <translation>Создать группу изменений...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1019" /> <source>Create changegroup file collecting changesets</source> <translation>Создать файл группы изменений, содержащий наборы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1013" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1022" /> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation><b>Создать группу изменений</b><p>Создание файла групп изменений, содержащего выбранные наборы изменений (команда hg bundle).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1023" /> - <source>Preview changegroup</source> - <translation>Просмотр группы изменений</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1025" /> - <source>Preview changegroup...</source> - <translation>Просмотр группы изменений...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032" /> + <source>Preview changegroup</source> + <translation>Просмотр группы изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1034" /> + <source>Preview changegroup...</source> + <translation>Просмотр группы изменений...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041" /> <source>Preview a changegroup file containing a collection of changesets</source> <translation>Просмотр файла группы изменений, содержащего коллекцию наборов изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044" /> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation><b>Просмотр групп изменений</b><p>Просмотр файла группы изменений, содержащего коллекцию наборов изменений.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2244" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1045" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2263" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054" /> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1047" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056" /> <source>Apply changegroups...</source> <translation>Применить группу изменений...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063" /> <source>Apply one or several changegroup files</source> <translation>Применить один или несколько файлов групп изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066" /> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation><b>Применить группы изменений</b><p>Применение одного или нескольких файлов групп изменений, созданных командой 'Создать группу изменений' (команда hg unbundle).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1067" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076" /> <source>Mark as "good"</source> <translation>Пометить как "хорошие"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1077" /> <source>Mark as "good"...</source> <translation>Пометить как "хорошие"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1075" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1084" /> <source>Mark a selectable changeset as good</source> <translation>Пометить выбранный набор изменений как "хорошие"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1078" /> - <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> - <translation><b>Пометить как "хорошие"</b><p>Пометить выбранный набор изменений как "хорошие".</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1087" /> - <source>Mark as "bad"</source> - <translation>Пометить как "плохие"</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088" /> - <source>Mark as "bad"...</source> - <translation>Пометить как "плохие"...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1094" /> - <source>Mark a selectable changeset as bad</source> - <translation>Пометить выбранный набор изменений как "плохие"</translation> + <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> + <translation><b>Пометить как "хорошие"</b><p>Пометить выбранный набор изменений как "хорошие".</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1096" /> - <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> - <translation><b>Пометить как "плохие"</b><p>Пометить выбранный набор изменений как "плохие".</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105" /> - <source>Skip</source> - <translation>Пропустить</translation> + <source>Mark as "bad"</source> + <translation>Пометить как "плохие"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1097" /> + <source>Mark as "bad"...</source> + <translation>Пометить как "плохие"...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103" /> + <source>Mark a selectable changeset as bad</source> + <translation>Пометить выбранный набор изменений как "плохие"</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105" /> + <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> + <translation><b>Пометить как "плохие"</b><p>Пометить выбранный набор изменений как "плохие".</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1114" /> + <source>Skip</source> + <translation>Пропустить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1114" /> <source>Skip...</source> <translation>Пропустить...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1107" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116" /> <source>Skip a selectable changeset</source> <translation>Пропустить выбранный набор изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1109" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118" /> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation><b>Пропустить</b><p>Пропустить выбранный набор изменений.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1115" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1115" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124" /> <source>Reset</source> <translation>Рестарт</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1117" /> - <source>Reset the bisect search data</source> - <translation>Сбросить данные Bisect-поиска</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119" /> - <source><b>Reset</b><p>This resets the bisect search data.</p></source> - <translation><b>Сбросить</b><p>Сброс данных bisect-поиска.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1126" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1125" /> + <source>Reset the bisect search data</source> + <translation>Сбросить данные Bisect-поиска</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128" /> + <source><b>Reset</b><p>This resets the bisect search data.</p></source> + <translation><b>Сбросить</b><p>Сброс данных bisect-поиска.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1135" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134" /> <source>Back out changeset</source> <translation>Отменить набор изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1142" /> <source>Back out changes of an earlier changeset</source> <translation>Отменить предыдущий набор изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1145" /> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation><b>Отменить набор изменений</b><p>Отмена предыдущего набора изменений.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1145" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1155" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154" /> <source>Rollback last transaction</source> <translation>Откатить последнюю транзакцию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1152" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161" /> <source>Rollback the last transaction</source> <translation>Откатить последнюю транзакцию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1163" /> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation><b>Откатить последнюю транзакцию</b><p>Выполняет откат последней транзакции. Транзакции используются для инкапсуляции последствий всех команд, которые создают новые наборы изменений или перемещают существующие наборы изменений в хранилище. Например, следующие команды являются транзакционными, и их последствия могут быть отменены:<ul><li>commit</li><li>import</li><li>pull</li><li>push (текущее хранилище как место назначения)</li><li>unbundle</li></ul></p><p><strong>Эта команда опасна. Пожалуйста, используйте ее с осторожностью.</strong></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1176" /> - <source>Serve project repository</source> - <translation>Автономный сервер репозитория проекта</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1177" /> - <source>Serve project repository...</source> - <translation>Автономный сервер репозитория проекта...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183" /> - <source>Serve the project repository</source> - <translation>Запуск автономного сервера репозитория проекта</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185" /> + <source>Serve project repository</source> + <translation>Автономный сервер репозитория проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1186" /> + <source>Serve project repository...</source> + <translation>Автономный сервер репозитория проекта...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1192" /> + <source>Serve the project repository</source> + <translation>Запуск автономного сервера репозитория проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1194" /> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation><b>Автономный сервер репозитория проекта</b><p>Запуск автономного сервера для репозитория проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2301" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1194" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1203" /> <source>Import Patch</source> <translation>Импорт патча</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1196" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1205" /> <source>Import Patch...</source> <translation>Импорт патча...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1202" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211" /> <source>Import a patch from a patch file</source> <translation>Импортировать патч из файла патча</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1204" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1213" /> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation><b>Импорт патча</b><p>Импортирование патча из файла патча в проект.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1214" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1223" /> <source>Export Patches</source> <translation>Экспорт патчей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1225" /> <source>Export Patches...</source> <translation>Экспорт патчей...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1222" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1231" /> <source>Export revisions to patch files</source> <translation>Экспорт ревизий в файлы патчей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1224" /> - <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> - <translation><b>Экспорт патчей</b><p>Экспорт ревизий проекта в файл патча.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233" /> - <source>Change Phase</source> - <translation>Изменить фазу</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234" /> - <source>Change Phase...</source> - <translation>Изменить фазу...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1240" /> - <source>Change the phase of revisions</source> - <translation>Изменить фазу ревизий</translation> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> + <translation><b>Экспорт патчей</b><p>Экспорт ревизий проекта в файл патча.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1242" /> + <source>Change Phase</source> + <translation>Изменить фазу</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1243" /> + <source>Change Phase...</source> + <translation>Изменить фазу...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1249" /> + <source>Change the phase of revisions</source> + <translation>Изменить фазу ревизий</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251" /> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation><b>Изменить фазу</b><p>Изменение фазы выбранных ревизий.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2343" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1804" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1253" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2362" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1822" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1262" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1260" /> <source>Copy Changesets</source> <translation>Копировать наборы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1259" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1268" /> <source>Copies changesets from another branch</source> <translation>Копирование в текущую ветку наборов изменений из другой ветки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1261" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270" /> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation><b>Копировать наборы изменений</b><p>Копирование в текущую рабочую директорию наборов изменений из другой ветки , сохраняются имя пользователя, дата и описание оригинальных изменений.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1273" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1272" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1282" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1281" /> <source>Continue Copying Session</source> <translation>Продолжить сеанс копирования</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1280" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1289" /> <source>Continue the last copying session after conflicts were resolved</source> <translation>Продолжить последний сеанс копирования после решения конфликтов</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1283" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1292" /> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation><b>Продолжить сеанс копирования</b><p>Продолжение последнего сеанса копирования после решения конфликтов.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1294" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1293" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1303" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1302" /> <source>Stop Copying Session</source> <translation>Остановить сеанс копирования</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1310" /> <source>Stop the interrupted copying session</source> <translation>Остановить прерваннуый сеанс копирования</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1304" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1313" /> <source><b>Stop Copying Session</b><p>This stops the interrupted copying session.</p></source> <translation><b>Остановить сеанс копирования</b><p>Остановить прерванный сеанс копирования.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1314" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1313" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1323" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1322" /> <source>Abort Copying Session</source> <translation>Отменить сеанс копирования</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1321" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330" /> <source>Abort the interrupted copying session and rollback</source> <translation>Отменить прерванный сеанс копирования и откатить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1324" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1333" /> <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> <translation><b>Отменить сеанс копирования</b><p>Отменить прерванный сеанс копирования и откатить к состоянию перед копированием.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1334" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1343" /> <source>Add</source> <translation>Добавить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1336" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1345" /> <source>Add...</source> <translation>Добавить...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1342" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1351" /> <source>Add a sub-repository</source> <translation>Добавить субрепозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1344" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1353" /> <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation><b>Добавить...</b><p>Добавление субрепозитория в проект.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1350" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1359" /> <source>Remove</source> <translation>Удалить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1352" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1361" /> <source>Remove...</source> <translation>Удалить...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1358" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367" /> <source>Remove sub-repositories</source> <translation>Удалить субрепозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1360" /> - <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> - <translation><b>Удалить...</b><p>Удаление субрепозиториев из проекта.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1369" /> - <source>Create unversioned archive</source> - <translation>Создать неверсированный архив</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1371" /> - <source>Create unversioned archive...</source> - <translation>Создать неверсированный архив...</translation> + <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> + <translation><b>Удалить...</b><p>Удаление субрепозиториев из проекта.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1378" /> + <source>Create unversioned archive</source> + <translation>Создать неверсированный архив</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1380" /> + <source>Create unversioned archive...</source> + <translation>Создать неверсированный архив...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1387" /> <source>Create an unversioned archive from the repository</source> <translation>Создать из репозитория неверсированный архив</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1381" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1390" /> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation><b>Создать неверсированный архив...</b><p>Создание из репозитория неверсированного архива.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1391" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1400" /> <source>List bookmarks</source> <translation>Список закладок</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1393" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1402" /> <source>List bookmarks...</source> <translation>Список закладок...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1399" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1408" /> <source>List bookmarks of the project</source> <translation>Список закладок проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1401" /> - <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> - <translation><b>Список закладок</b><p>Отображение списка закладок текущего проекта.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1410" /> - <source>Define bookmark</source> - <translation>Определить закладку</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1412" /> - <source>Define bookmark...</source> - <translation>Определить закладку...</translation> + <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> + <translation><b>Список закладок</b><p>Отображение списка закладок текущего проекта.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1419" /> + <source>Define bookmark</source> + <translation>Определить закладку</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1421" /> + <source>Define bookmark...</source> + <translation>Определить закладку...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1428" /> <source>Define a bookmark for the project</source> <translation>Определить закладку проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1422" /> - <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> - <translation><b>Определить закладку</b><p>Определение закладки текущего проекта.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1431" /> - <source>Delete bookmark</source> - <translation>Удалить закладку</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1433" /> - <source>Delete bookmark...</source> - <translation>Удалить закладку...</translation> + <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> + <translation><b>Определить закладку</b><p>Определение закладки текущего проекта.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1440" /> + <source>Delete bookmark</source> + <translation>Удалить закладку</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1442" /> + <source>Delete bookmark...</source> + <translation>Удалить закладку...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1449" /> <source>Delete a bookmark of the project</source> <translation>Удалить закладку проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1443" /> - <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> - <translation><b>Удалить закладку</b><p>Удаление закладки проекта.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1452" /> - <source>Rename bookmark</source> - <translation>Переименовать закладку</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1454" /> - <source>Rename bookmark...</source> - <translation>Переименовать закладку...</translation> + <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> + <translation><b>Удалить закладку</b><p>Удаление закладки проекта.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1461" /> + <source>Rename bookmark</source> + <translation>Переименовать закладку</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1463" /> + <source>Rename bookmark...</source> + <translation>Переименовать закладку...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1470" /> <source>Rename a bookmark of the project</source> <translation>Переименовать закладку проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1464" /> - <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> - <translation><b>Переименовать закладку</b><p>Переименование закладки проекта.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1473" /> + <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> + <translation><b>Переименовать закладку</b><p>Переименование закладки проекта.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1482" /> <source>Move bookmark</source> <translation>Переместить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1475" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1484" /> <source>Move bookmark...</source> <translation>Переместить закладку...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1481" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1490" /> <source>Move a bookmark of the project</source> <translation>Переместить закладку проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1483" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1492" /> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation><b>Переместить закладку</b><p>Перемещение закладки проекта в другой набор изменений.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1495" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1493" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1504" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1502" /> <source>Show incoming bookmarks</source> <translation>Показать входящие закладки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1502" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1511" /> <source>Show a list of incoming bookmarks</source> <translation>Показать список входящих закладок</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1505" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1514" /> <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> <translation><b>Показать входящие закладки</b><p>Отображение списка новых закладок, доступных в удаленном репозитории.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1517" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1515" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1526" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1524" /> <source>Pull bookmark</source> <translation>Затянуть закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1524" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1533" /> <source>Pull a bookmark from a remote repository</source> <translation>Затянуть закладку из удалённого репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1527" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1536" /> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation><b>Затянуть закладку</b><p>Загрузка закладки из удалённого репозитория в локальный.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1539" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1537" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1548" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1546" /> <source>Pull current bookmark</source> <translation>Затянуть текущую закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1546" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1555" /> <source>Pull the current bookmark from a remote repository</source> <translation>Затянуть текущую закладку из удаленного репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1549" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1558" /> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation><b>Затянуть текущую закладку</b><p>Затягивание текущей закладки из удаленного репозитория в локальный репозиторий.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1560" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1558" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1569" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1567" /> <source>Show outgoing bookmarks</source> <translation>Показать исходящие закладки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1567" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1576" /> <source>Show a list of outgoing bookmarks</source> <translation>Показать список исходящих закладок</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1570" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1579" /> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation><b>Показать исходящие закладки</b><p>Отображение списка новых закладок, доступных в локальном репозитории.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1582" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1580" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1591" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1589" /> <source>Push bookmark</source> <translation>Протолкнуть закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1589" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1598" /> <source>Push a bookmark to a remote repository</source> <translation>Протолкнуть закладку в удалённый репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1592" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1601" /> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation><b>Протолкнуть закладку</b><p>Передача закладки из локального репозитория в удалённый репозиторий.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1604" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1602" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1613" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1611" /> <source>Push current bookmark</source> <translation>Протолкнуть текущую закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1611" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1620" /> <source>Push the current bookmark to a remote repository</source> <translation>Протолкнуть текущую закладку в удаленный репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1614" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1623" /> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation><b>Протолкнуть текущую закладку</b><p>Проталкивание текущей закладки из локального репозитория в удаленный репозиторий.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1626" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1624" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1635" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1633" /> <source>Push all bookmarks</source> <translation>Протолкнуть все закладки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1633" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1642" /> <source>Push all bookmarks to a remote repository</source> <translation>Протолкнуть все закладки в удаленный репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1636" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1645" /> <source><b>Push all bookmarks</b><p>This pushes all bookmark from the local repository to a remote repository.</p></source> <translation><b>Протолкнуть все закладки</b><p>Это перемещает все закладки из локального репозитория в удаленный репозиторий.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1647" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1645" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1656" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1654" /> <source>Delete all backups</source> <translation>Удалить все резервные копии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1654" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1663" /> <source>Delete all backup bundles stored in the backup area</source> <translation>Удалить все резервные комплекты, сохраненные в области резервного копирования</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1657" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1666" /> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation><b>Удалить все резервные копии</b><p>Удаление всех резервных комплектов, сохраненных в области резервного копирования репозитория.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1699" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1708" /> <source>Administration</source> <translation>Администрирование</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1724" /> - <source>Specials</source> - <translation>Специальные</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1733" /> + <source>Specials</source> + <translation>Специальные</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1742" /> <source>Changegroup Management</source> <translation>Управление группами изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1740" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1749" /> <source>Patch Management</source> <translation>Управление патчами</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1746" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1755" /> <source>Bisect</source> <translation>Поиск ревизии методом деления пополам (bisect)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1754" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1763" /> <source>Tags</source> <translation>Теги</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1761" /> - <source>Branches</source> - <translation>Ветки</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1770" /> + <source>Branches</source> + <translation>Ветки</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1779" /> <source>Bookmarks</source> <translation>Закладки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1791" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1800" /> + <source>Other Functions</source> + <translation>Другие функции</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1809" /> <source>Extensions</source> <translation>Плагины</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1813" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1831" /> <source>Sub-Repository</source> <translation>Субрепозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1818" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1836" /> <source>Merge Changesets</source> <translation>Слить наборы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1903" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1901" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1922" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1920" /> <source>Mercurial</source> <translation>Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2054" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2073" /> <source>Pull</source> <translation>Затянуть</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2391" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2375" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2360" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2344" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2323" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2302" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2245" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2055" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2410" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2394" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2379" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2363" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2342" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2321" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2264" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2074" /> <source>The project should be reread. Do this now?</source> <translation>Проект должен быть перепрочитан. Сделать это сейчас?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2322" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2341" /> <source>Revert Changes</source> <translation>Отменить изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2359" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2378" /> <source>Copy Changesets (Continue)</source> <translation>Копировать набор изменений (продолжение)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2374" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2393" /> <source>Copy Changesets (Stop)</source> <translation>Копировать наборы изменений (Stop)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2390" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2409" /> <source>Copy Changesets (Abort)</source> <translation>Копировать наборы изменений (Abort)</translation> </message> @@ -40785,7 +40985,7 @@ <context> <name>HgPurgeListDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/HgPurgeListDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/HgPurgeListDialog.ui" line="0" /> <source>Purge List</source> <translation>Список зачистки</translation> </message> @@ -41957,87 +42157,87 @@ <context> <name>HgShelveBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Mercurial Shelve Browser</source> <translation>Mercurial: Браузер отложенных (shelve) изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Name</source> <translation>Имя</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Age</source> <translation>Возраст</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Message</source> <translation>Сообщение</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Statistics</source> <translation>Статистика</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>File</source> <translation>Файл</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Changes</source> <translation>Изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Lines added</source> <translation>Добавлено строк</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Lines deleted</source> <translation>Удалено строк</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Errors</source> <translation>Ошибки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source><b>Mercurial shelve errors</b><p>This shows possible error messages of the hg shelve command.</p></source> <translation><b>Mercurial: Ошибки shelve</b><p>Отображение возможных ошибок команды hg shelve.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="58" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="58" /> <source>&Refresh</source> <translation>&Освежить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="60" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="60" /> <source>Press to refresh the list of shelves</source> <translation>Освежить список отложенных изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="69" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="69" /> <source>Restore selected shelve</source> <translation>Восстановить выбранные отложенные изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="72" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="72" /> <source>Delete selected shelves</source> <translation>Удалить выбранные отложенные изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="75" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="75" /> <source>Delete all shelves</source> <translation>Удалить все отложенные изменения</translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="290" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="290" /> <source>%n file(s) changed</source> <translation> <numerusform>%n файл изменен</numerusform> @@ -42046,7 +42246,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="292" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="292" /> <source>%n line(s) inserted</source> <translation> <numerusform>%n строка вставлена</numerusform> @@ -42055,7 +42255,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="295" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="295" /> <source>%n line(s) deleted</source> <translation> <numerusform>%n строка удалена</numerusform> @@ -42067,57 +42267,57 @@ <context> <name>HgShelveDataDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Shelve</source> <translation>Отложенные изменения (Shelve)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Name:</source> <translation>Имя:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Enter a name for the shelve</source> <translation>Введите имя отложенного изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Date, Time:</source> <translation>Дата и время:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Enter the commit date and time for the shelve</source> <translation>Введите дату и время фиксации для отложенного изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>yyyy-MM-dd HH:mm</source> <translation>гггг-ММ-дд ЧЧ:мм</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Message:</source> <translation>Сообщение:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Enter a message for the shelve</source> <translation>Введите сообщение для отложенного изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Mark new/missing files as added/removed</source> <translation>Пометить новые/отсутствующие файлы как добавленные/удалённые</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Select to shelve, but keep the changes in the working directory</source> <translation>Разрешить откладывать изменения, но сохранять их в рабочей директории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Shelve, but keep changes</source> <translation>Откладывать изменения, но сохранять их</translation> </message> @@ -42125,7 +42325,7 @@ <context> <name>HgShelvesSelectionDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelvesSelectionDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelvesSelectionDialog.ui" line="0" /> <source>Mercurial Shelve Selection</source> <translation>Mercurial: Выбор отложенных изменений (Shelve)</translation> </message> @@ -42427,129 +42627,6 @@ </message> </context> <context> - <name>HgStripDialog</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Strip Changesets</source> - <translation>Срезать наборы изменений (Strip)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>&Revision</source> - <translation>&Ревизия</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to specify a revision by number</source> - <translation>Разрешить задание ревизии порядковым номером</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Number</source> - <translation>Номер</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enter a revision number</source> - <translation>Задайте номер ревизии</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to specify a revision by changeset id</source> - <translation>Разрешить задание ревизии идентификатором набора изменений</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Id:</source> - <translation>Id:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enter a changeset id</source> - <translation>Задайте идентификатор набора изменений</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to specify a revision by a tag</source> - <translation>Разрешить задание ревизии с помощью тега</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Tag:</source> - <translation>Тег:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enter a tag name</source> - <translation>Введите имя тега</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to specify a revision by a branch</source> - <translation>Разрешить задание ревизии с помощью ветки</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Branch:</source> - <translation>Ветка:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enter a branch name</source> - <translation>Введите имя ветки</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Expression:</source> - <translation>Выражение:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enter a revision set expression</source> - <translation>Введите выражение ревизии набора</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Bookmark:</source> - <translation>Закладка:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enter a bookmark name</source> - <translation>Введите имя закладки</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to enforce removal of changesets</source> - <translation>Разрешить принудительное удаление наборов изменений</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enforce Operation</source> - <translation>Выполнять принудительно</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to not create backup bundles</source> - <translation>Разрешить не создавать резервные комплекты</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>No Backup</source> - <translation>Без резервного копирования</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to keep the current working directory state</source> - <translation>Разрешить сохранять текущее состояние рабочей директории</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Keep Working Directory</source> - <translation>Сохранять рабочую директорию</translation> - </message> - </context> - <context> <name>HgSummaryDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.ui" line="0" /> @@ -43062,29 +43139,119 @@ </message> </context> <context> + <name>HgUncommitDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Undo Local Commit</source> + <translation>Отменить локальную фиксацию</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Commit Message</source> + <translation>Сообщение фиксации</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Enter the log message.</source> + <translation>Задайте сообщение для журнала.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source><b>Log Message</b> +<p>Enter the log message for the uncommit action.</p></source> + <translation><b>Сообщение журнала</b> +<p>Введите сообщение журнала для незавершенного действия.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Recent commit messages</source> + <translation>Недавние сообщения фиксации</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Select a recent commit message to use</source> + <translation>Выберите недавнее сообщение фиксации</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Select to allow an empty commit after undoing it.</source> + <translation>Разрешить пустую фиксацию после ее отмены.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Allow empty commit after undoing commit</source> + <translation>Разрешать пустую фиксацию после отмены фиксации</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Select to allow undoing the commit with outstanding changes.</source> + <translation>Разрешить отмену фиксации с внесенными изменениями.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Allow undoing commit with outstanding changes</source> + <translation>Разрешать отменять фиксацию с внесенными изменениями</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Author</source> + <translation>Автор</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Enter author name to override the configured user:</source> + <translation>Введите имя автора для переопределения сконфигурированного пользователя:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Enter an author name in order to override the configured one</source> + <translation>Введите имя автора для переопределения уже сконфигурированных</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Select to give date and time information</source> + <translation>Разрешить задание даты и времени</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Date and Time</source> + <translation>Дата и время</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Date/Time:</source> + <translation>Дата/Время:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Enter the date and time to be used</source> + <translation>Введите дату и время</translation> + </message> + </context> + <context> <name>HgUnshelveDataDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Mercurial Unshelve</source> <translation>Mercurial: Восстановление отложенных изменений (Unshelve)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Name:</source> <translation>Имя:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Enter the name of the shelve</source> <translation>Задайте имя отложенного изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Select to keep the shelved change</source> <translation>Разрешить сохранение отложенных изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Keep shelved change</source> <translation>Сохранять отложенные изменения</translation> </message> @@ -43154,23 +43321,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" /> @@ -43185,53 +43352,43 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the Purge extension</source> - <translation>Активировать плагин Purge</translation> + <source>Select to activate the histedit extension</source> + <translation>Активировать плагин Histedit</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Purge</source> - <translation>Purge</translation> + <source>Histedit</source> + <translation>Histedit</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the queues extension</source> - <translation>Активировать плагин Queues</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Queues</source> - <translation>Queues</translation> + <source>Select to activate the GPG extension</source> + <translation>Активировать плагин GPG</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the rebase extension</source> - <translation>Активировать плагин Rebase</translation> + <source>GPG</source> + <translation>GPG</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Rebase</source> - <translation>Rebase</translation> + <source>Select to activate the fastexport extension</source> + <translation>Активировать плагин быстрого экспорта</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the shelve extension</source> - <translation>Активировать плагин Shelve</translation> + <source>Fastexport</source> + <translation>Fastexport</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Shelve</source> - <translation>Shelve</translation> + <source>Select to activate the uncommit extension</source> + <translation>Активировать плагин для распаковки</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the strip extension</source> - <translation>Активировать плагин Strip</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Strip</source> - <translation>Strip</translation> + <source>Uncommit</source> + <translation>Uncommit</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> @@ -43450,32 +43607,32 @@ <translation>По умолчанию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="527" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="474" /> <source>Delete Host Fingerprint</source> <translation>Удалить отпечаток хоста</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="528" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="475" /> <source><p>Shall the fingerprint for host <b>{0}</b> really be deleted?</p></source> <translation><p>Действительно ли отпечаток хоста <b>{0}</b> должен быть удален?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="644" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="591" /> <source>Delete Host Minimum Protocol</source> <translation>Удалить минимальную версию протокола</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="645" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="592" /> <source><p>Shall the minimum protocol entry for host <b>{0}</b> really be deleted?</p></source> <translation><p>Действительно ли запись о минимальной версии протокола хоста <b>{0}</b> должна быть удалена?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="708" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="655" /> <source>Edit User Configuration</source> <translation>Правка конфигурации пользователя</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="709" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="656" /> <source>You will loose all changes made in this dialog. Shall the data be saved first?</source> <translation>Вы можете потерять все изменения, сделанные в данном диалоге. Может сначала сохранить все данные?</translation> </message> @@ -43554,17 +43711,17 @@ <context> <name>HgUtilities</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="130" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="132" /> <source>The hg process finished with the exit code {0}</source> <translation>hg процесс завершен с кодом возврата {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="134" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="136" /> <source>The hg process did not finish within 30s.</source> <translation>hg процесс не завершился в течение 30 секунд.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="138" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="140" /> <source>Could not start the hg executable.</source> <translation>Невозможно запустить исполняемый файл hg.</translation> </message> @@ -52739,8 +52896,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> @@ -54110,7 +54267,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>{0} (0x{1:04x}/0x{2:04x})</translation> </message> <message> @@ -59685,40 +59842,40 @@ <translation>Деинсталировать пакеты из 'pyproject.toml'</translation> </message> <message> - <location filename="../PipInterface/Pip.py" line="1195" /> + <location filename="../PipInterface/Pip.py" line="1197" /> <source>Cache Info</source> <translation>Информация о кэше</translation> </message> <message> - <location filename="../PipInterface/Pip.py" line="1221" /> - <location filename="../PipInterface/Pip.py" line="1212" /> + <location filename="../PipInterface/Pip.py" line="1223" /> + <location filename="../PipInterface/Pip.py" line="1214" /> <source>List Cached Files</source> <translation>Список кэшированных файлов</translation> </message> <message> - <location filename="../PipInterface/Pip.py" line="1213" /> + <location filename="../PipInterface/Pip.py" line="1215" /> <source>Enter a file pattern (empty for all):</source> <translation>Задайте шаблон файлов (пустая строка - все файлы):</translation> </message> <message> - <location filename="../PipInterface/Pip.py" line="1245" /> - <location filename="../PipInterface/Pip.py" line="1238" /> + <location filename="../PipInterface/Pip.py" line="1247" /> + <location filename="../PipInterface/Pip.py" line="1240" /> <source>Remove Cached Files</source> <translation>Удалить кэшированные файлы</translation> </message> <message> - <location filename="../PipInterface/Pip.py" line="1239" /> + <location filename="../PipInterface/Pip.py" line="1241" /> <source>Enter a file pattern:</source> <translation>Задайте шаблон файла:</translation> </message> <message> - <location filename="../PipInterface/Pip.py" line="1270" /> - <location filename="../PipInterface/Pip.py" line="1262" /> + <location filename="../PipInterface/Pip.py" line="1272" /> + <location filename="../PipInterface/Pip.py" line="1264" /> <source>Purge Cache</source> <translation>Очистить кэш</translation> </message> <message> - <location filename="../PipInterface/Pip.py" line="1263" /> + <location filename="../PipInterface/Pip.py" line="1265" /> <source>Do you really want to purge the pip cache? All files need to be downloaded again.</source> <translation>Вы действительно хотите очистить pip-кэш? Все файлы должны быть загружены снова.</translation> </message> @@ -60338,75 +60495,13 @@ </message> <message> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to install the selected package</source> - <translation>Установить выбранный пакет</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to install the selected package to the user site</source> - <translation>Установить выбранный пакет в user site</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to show details for the selected entry</source> - <translation>Показать информацию для выбранной записи</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Toggle to show or hide the search window</source> - <translation>Показать / скрыть окно поиска</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Package</source> - <translation>Пакет</translation> + <source>Press to refresh the lists</source> + <translation>Освежить списки</translation> </message> <message> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Enter the search term for the package name</source> - <translation>Введите имя пакета в поисковый запрос</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Enter search term</source> - <translation>Введите поисковый запрос</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to start the search</source> - <translation>Начать поиск</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to search for more packages</source> - <translation>Поиск следующих пакетов</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Version</source> - <translation>Версия</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Released</source> - <translation>Выпущен</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Description</source> - <translation>Описание</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to refresh the lists</source> - <translation>Освежить списки</translation> + <source>Press to install a package.</source> + <translation>Установить пакет.</translation> </message> <message> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> @@ -60425,6 +60520,17 @@ </message> <message> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Press to show details for the selected entry</source> + <translation>Показать информацию для выбранной записи</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Press to remove leftovers of an upgrade or uninstall run.</source> + <translation>Yдалить остатки обновления или деинсталляции.</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> <source>Select to show only locally-installed packages</source> <translation>Отображать только локально установленные пакеты</translation> </message> @@ -60468,6 +60574,13 @@ <message> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Package</source> + <translation>Пакет</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> <source>Installed</source> <translation>Установленная версия</translation> </message> @@ -60562,319 +60675,317 @@ <translation>Требуемая</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="199" /> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Search Package:</source> + <translation>Найти пакет:</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Enter package name to search for.</source> + <translation>Введите имя пакета для поиска.</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Press to open a web browser for searching.</source> + <translation>Открыть веб-браузер для поиска.</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="83" /> <source>pip Menu</source> <translation>Меню pip</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="233" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="113" /> <source>Author:</source> <translation>Автор:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="234" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="114" /> <source>Author Email:</source> <translation>Email автора:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="235" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="115" /> <source>Classifiers:</source> <translation>Классификаторы:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="236" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="116" /> <source>Entry Points:</source> <translation>Точки входа:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="237" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="117" /> <source>Files:</source> <translation>Файлы:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="238" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="118" /> <source>Homepage:</source> <translation>Домашняя страница:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="239" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="119" /> <source>Installer:</source> <translation>Установщик:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="240" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="120" /> <source>License:</source> <translation>Лицензия:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="241" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="121" /> <source>Location:</source> <translation>Расположение:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="242" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="122" /> <source>Metadata Version:</source> <translation>Версия Metadata:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="243" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="123" /> <source>Name:</source> <translation>Имя:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="244" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="124" /> <source>Project URLs:</source> <translation>URLы проекта:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="245" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="125" /> <source>Requires:</source> <translation>Зависимости:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="246" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="126" /> <source>Required By:</source> <translation>Зависимые:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="247" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="127" /> <source>Summary:</source> <translation>Аннотация:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="248" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="128" /> <source>Version:</source> <translation>Версия:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="450" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="335" /> <source>Getting installed packages...</source> <translation>Получение списка установленных пакетов...</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="478" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="363" /> <source>Getting outdated packages...</source> <translation>Получение списка обновленных пакетов...</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1231" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1051" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1038" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1002" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="735" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="729" /> + <source>Cleanup Environment</source> + <translation>Очистка среды</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="730" /> + <source>The environment cleanup was successful.</source> + <translation>Очистка среды прошла успешно.</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="736" /> + <source>Some leftover package directories could not been removed. Delete them manually.</source> + <translation>Не удалось удалить некоторые оставшиеся директории пакетов. Удалите их вручную.</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="832" /> <source>Search PyPI</source> <translation>Поиск в PyPI</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1003" /> - <source><p>Received an error while searching for <b>{0}</b>.</p><p>Error: {1}</p></source> - <translation><p>Получена ошибка при поиске <b>{0}</b>.</p><p>Ошибка: {1}</p></translation> - </message> - <message numerus="yes"> - <location filename="../PipInterface/PipPackagesWidget.py" line="1018" /> - <source>%n package(s) found.</source> - <translation> - <numerusform>Найден %n пакет.</numerusform> - <numerusform>Найдены %n пакета.</numerusform> - <numerusform>Найдено %n пакетов.</numerusform> - </translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1025" /> - <source>Showing first {0} packages found.</source> - <translation>Показаны первые {0} найденных пакетов.</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1044" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1039" /> - <source><p>There were no results for <b>{0}</b>.</p></source> - <translation><p>Нет результатов по запросу <b>{0}</b>.</p></translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1052" /> - <source><p>There were no more results for <b>{0}</b>.</p></source> - <translation><p>По запросу <b>{0}</b> больше нет результатов.</p></translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1232" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="833" /> <source><p>No package details info for <b>{0}</b> available.</p></source> <translation><p>Недоступна подробная информация о пакете <b>{0}</b>.</p></translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1251" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="852" /> <source>Pip</source> <translation>Pip</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1253" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="854" /> <source>Install Pip</source> <translation>Инсталировать Pip</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1256" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="857" /> <source>Install Pip to User-Site</source> <translation>Инсталировать Pip в User-Site</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1259" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="860" /> <source>Repair Pip</source> <translation>Восстановить Pip</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1266" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="867" /> <source>Install</source> <translation>Установить</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1445" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1268" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1046" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="869" /> <source>Install Packages</source> <translation>Установить пакеты</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1271" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="872" /> <source>Install Local Package</source> <translation>Установить локальный пакет</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1274" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="875" /> <source>Re-Install Selected Packages</source> <translation>Переинсталировать выбранные пакеты</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1281" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="882" /> <source>Requirements/Constraints</source> <translation>Зависимости/Ограничения</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1283" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="884" /> <source>Install Requirements</source> <translation>Установить зависимости</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1286" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="887" /> <source>Uninstall Requirements</source> <translation>Деинсталировать зависимости</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1289" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="890" /> <source>Generate Requirements...</source> <translation>Генерировать зависимости...</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1293" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="894" /> <source>Install from 'pyproject.toml'</source> <translation>Установить из 'pyproject.toml'</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1297" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="898" /> <source>Uninstall from 'pyproject.toml'</source> <translation>Деинсталировать из 'pyproject.toml'</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1302" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="903" /> <source>Generate Constraints...</source> <translation>Генерировать ограничения...</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1309" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="910" /> <source>Cache</source> <translation>Кэш</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1311" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="912" /> <source>Show Cache Info...</source> <translation>Показать информацию о кэше...</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1314" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="915" /> <source>Show Cached Files...</source> <translation>Показать кэшированные файлы...</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1317" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="918" /> <source>Remove Cached Files...</source> <translation>Удалить кэшированные файлы...</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1320" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="921" /> <source>Purge Cache...</source> <translation>Очистить кэш...</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1337" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="938" /> <source>Show Licenses...</source> <translation>Показать лицензии...</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1341" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="942" /> <source>Check Vulnerabilities</source> <translation>Проверить уязвимости</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1345" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="946" /> <source>Update Vulnerability Database</source> <translation>Обновить базу уязвимостей</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1349" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="950" /> <source>Create SBOM file</source> <translation>Создать файл SBOM</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1356" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="957" /> <source>Edit User Configuration...</source> <translation>Правка конфигурации пользователя...</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1359" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="960" /> <source>Edit Environment Configuration...</source> <translation>Правка конфигурации среды окружения...</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1364" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="965" /> <source>Configure...</source> <translation>Настроить...</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1608" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1595" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1584" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1209" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1196" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1185" /> <source>Edit Configuration</source> <translation>Правка конфигурации</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1609" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1596" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1585" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1210" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1197" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1186" /> <source>No valid configuration path determined. Aborting</source> <translation>Не определен допустимый путь конфигурации. Прерывание</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1818" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1419" /> <source>{0} {1}</source> <comment>package name, package version</comment> <translation>{0} {1}</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1839" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1440" /> <source>Affected Version:</source> <translatorcomment>Подверженная уязвимости версия: Пораженная версия Уязвимая</translatorcomment> <translation>Версия с уязвимостью:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1842" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1443" /> <source>Advisory:</source> <translatorcomment>Консультация: Рекомендация</translatorcomment> <translation>Рекомендуемая:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1977" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1952" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1578" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1553" /> <source>unknown</source> <translation>неизвестная</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1974" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1575" /> <source>any</source> <translation>любая</translation> </message> @@ -61716,64 +61827,69 @@ <name>PluginRepositoryWidget</name> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="124" /> - <source>Stable</source> - <translation>Стабильные</translation> + <source>Obsolete</source> + <translation>Устаревшие</translation> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="125" /> - <source>Unstable</source> - <translation>Нестабильные</translation> + <source>Stable</source> + <translation>Стабильные</translation> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="126" /> - <source>Obsolete</source> - <translation>Устаревшие</translation> + <source>Unknown</source> + <translation>Неизвестный</translation> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="127" /> - <source>Unknown</source> - <translation>Неизвестный</translation> - </message> - <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="179" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="139" /> - <source>Update</source> - <translation>Обновить</translation> + <source>Unstable</source> + <translation>Нестабильные</translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="128" /> + <source>Upgrade Available</source> + <translation>Доступно обновление</translation> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="182" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="145" /> - <source>Download</source> - <translation>Загрузить</translation> - </message> - <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="153" /> - <source>Download & Install</source> - <translation>Загрузить и установить</translation> - </message> - <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="188" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="161" /> - <source>Cancel</source> - <translation>Отмена</translation> - </message> - <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="167" /> - <source>Install</source> - <translation>Установить</translation> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="142" /> + <source>Update</source> + <translation>Обновить</translation> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="185" /> - <source>Download && Install</source> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="148" /> + <source>Download</source> + <translation>Загрузить</translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="156" /> + <source>Download & Install</source> <translation>Загрузить и установить</translation> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="191" /> - <source>Close && Install</source> - <translation>Закрыть и установить</translation> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="164" /> + <source>Cancel</source> + <translation>Отмена</translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="170" /> + <source>Install</source> + <translation>Установить</translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="188" /> + <source>Download && Install</source> + <translation>Загрузить и установить</translation> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="194" /> + <source>Close && Install</source> + <translation>Закрыть и установить</translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="197" /> <source>Close</source> <translation>Закрыть</translation> </message> @@ -61825,98 +61941,103 @@ <translation>Запрашиваемые плагины скачаны.</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="603" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="591" /> <source>Plugins Repository URL Changed</source> <translation>URL репозитория плагинов изменился</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="604" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="592" /> <source>The URL of the Plugins Repository has changed. Select the "Update" button to get the new repository file.</source> <translation>URL репозитория плагинов изменился. Нажмите кнопку "Обновить" чтобы загрузить новый файл репозитория.</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="613" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="601" /> <source>Read plugins repository file</source> <translation>Прочитать файл репозитория плагинов</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="614" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="602" /> <source><p>The plugins repository file <b>{0}</b> could not be read. Select Update</p></source> <translation><p>Невозможно прочитать файл репозитория <b>{0}</b>. Выполните обновление</p></translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="623" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="611" /> <source>No plugin repository file available. Select Update.</source> <translation>Файл репозитория плагинов недоступен. Выполните обновление.</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="627" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="615" /> <source>New: <b>{0}</b></source> <translation>Новые: <b>{0}</b></translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="629" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="617" /> <source>Local Updates: <b>{0}</b></source> <translation>Локальные обновления: <b>{0}</b></translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="632" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="620" /> <source>Remote Updates: <b>{0}</b></source> <translation>Удаленные обновления: <b>{0}</b></translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="705" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="673" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="693" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="661" /> <source>Error downloading file</source> <translation>Ошибка загрузки файла</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="706" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="674" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="694" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="662" /> <source><p>Could not download the requested file from {0}.</p><p>Error: {1}</p></source> <translation><p>Не удалось загрузить запрашиваемый файл из {0}.</p><p>Ошибка: {1}</p></translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="677" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="665" /> <source>No connection to Internet.</source> <translation>Нет подключения к интернету.</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="849" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="810" /> <source>up-to-date</source> <translation>новейший</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="852" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="813" /> <source>new download available</source> <translation>имеются обновления для загрузки</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="856" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="818" /> <source>update installable</source> <translation>обновления готовы к установке</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="860" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="823" /> <source>updated download available</source> <translation>имеется обновление</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="864" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="828" /> <source>error determining status</source> <translation>статус определения ошибки</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1269" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1239" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1002" /> + <source>{0}. {1}</source> + <translation>{0}. {1}</translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1346" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1316" /> <source>Cleanup of Plugin Downloads</source> <translation>Очистить загруженные плагины</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1273" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1242" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1350" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1319" /> <source><p>The plugin download <b>{0}</b> could not be deleted.</p><p>Reason: {1}</p></source> <translation><p>Невозможно удалить обновление для плагина <b>{0}</b>.</p><p>Причина: {1}</p></translation> </message> @@ -61924,17 +62045,17 @@ <context> <name>PluginRepositoryWindow</name> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1126" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1203" /> <source>Process Generation Error</source> <translation>Ошибка при запуске процесса</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1127" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1204" /> <source><p>Could not start the process.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Невозможно запустить процесс.<br>Убедитесь, что он доступен как <b>{0}</b>.</p></translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1131" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1208" /> <source>OK</source> <translation>ОК</translation> </message> @@ -62311,18 +62432,18 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1907" /> + <location filename="../Preferences/__init__.py" line="1909" /> <source>Export Preferences</source> <translation>Экспорт Preferences</translation> </message> <message> + <location filename="../Preferences/__init__.py" line="1938" /> + <location filename="../Preferences/__init__.py" line="1911" /> + <source>Properties File (*.ini);;All Files (*)</source> + <translation>Файлы Preferences (*.ini);;Все файлы (*)</translation> + </message> + <message> <location filename="../Preferences/__init__.py" line="1936" /> - <location filename="../Preferences/__init__.py" line="1909" /> - <source>Properties File (*.ini);;All Files (*)</source> - <translation>Файлы Preferences (*.ini);;Все файлы (*)</translation> - </message> - <message> - <location filename="../Preferences/__init__.py" line="1934" /> <source>Import Preferences</source> <translation>Импорт Preferences</translation> </message> @@ -62880,79 +63001,79 @@ <translation>Менеджер пакетов Conda</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="273" /> + <location filename="../Preferences/ProgramsDialog.py" line="275" /> <source>PyPI Package Management</source> <translation>Менеджер пакетов PyPI</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="525" /> - <location filename="../Preferences/ProgramsDialog.py" line="522" /> - <location filename="../Preferences/ProgramsDialog.py" line="506" /> - <location filename="../Preferences/ProgramsDialog.py" line="376" /> - <location filename="../Preferences/ProgramsDialog.py" line="309" /> - <location filename="../Preferences/ProgramsDialog.py" line="292" /> + <location filename="../Preferences/ProgramsDialog.py" line="527" /> + <location filename="../Preferences/ProgramsDialog.py" line="524" /> + <location filename="../Preferences/ProgramsDialog.py" line="508" /> + <location filename="../Preferences/ProgramsDialog.py" line="378" /> + <location filename="../Preferences/ProgramsDialog.py" line="311" /> + <location filename="../Preferences/ProgramsDialog.py" line="294" /> <source>(unknown)</source> <translation>(неизвестный)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="296" /> + <location filename="../Preferences/ProgramsDialog.py" line="298" /> <source>Spell Checker - PyEnchant</source> <translation>Проверка орфографии - PyEnchant</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="313" /> + <location filename="../Preferences/ProgramsDialog.py" line="315" /> <source>Source Highlighter - Pygments</source> <translation>Подсветка синтаксиса - Pygments</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="320" /> + <location filename="../Preferences/ProgramsDialog.py" line="322" /> <source>MicroPython - MPY Cross Compiler</source> <translation>MicroPython - MPY Cross Compiler</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="327" /> + <location filename="../Preferences/ProgramsDialog.py" line="329" /> <source>MicroPython - ESP Tool</source> <translation>MicroPython - ESP Tool</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="338" /> + <location filename="../Preferences/ProgramsDialog.py" line="340" /> <source>MicroPython - PyBoard Flasher</source> <translation>MicroPython - PyBoard Flasher</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="348" /> + <location filename="../Preferences/ProgramsDialog.py" line="350" /> <source>MicroPython - STLink Info</source> <translation>MicroPython - STLink Info</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="358" /> + <location filename="../Preferences/ProgramsDialog.py" line="360" /> <source>MicroPython - STLink Flasher</source> <translation>MicroPython - STLink Flasher</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="380" /> + <location filename="../Preferences/ProgramsDialog.py" line="382" /> <source>Code Assistant - Jedi</source> <translation>Code Assistant - Jedi</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="460" /> + <location filename="../Preferences/ProgramsDialog.py" line="462" /> <source>(not configured)</source> <translation>(не настроено)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="495" /> + <location filename="../Preferences/ProgramsDialog.py" line="497" /> <source>(module not found)</source> <translation>(модуль не найден)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="528" /> + <location filename="../Preferences/ProgramsDialog.py" line="530" /> <source>(not executable)</source> <translation>(не исполняемый)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="574" /> + <location filename="../Preferences/ProgramsDialog.py" line="576" /> + <location filename="../Preferences/ProgramsDialog.py" line="544" /> <location filename="../Preferences/ProgramsDialog.py" line="542" /> - <location filename="../Preferences/ProgramsDialog.py" line="540" /> <source>(not found)</source> <translation>(не найдено)</translation> </message> @@ -67178,7 +67299,7 @@ <translation>Alt+R</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="306" /> + <location filename="../Project/PropertiesDialog.py" line="312" /> <location filename="../Project/PropertiesDialog.py" line="71" /> <source>None</source> <translation>Нет</translation> @@ -67186,7 +67307,7 @@ <message> <location filename="../Project/PropertiesDialog.py" line="109" /> <source><p>The project directory must not be '<b>{0}</b>'.</p></source> - <translation>Директория '<b>{0}</b>'<p>не должна являться директорией проекта.</p></translation> + <translation>Директория '<b>{0}</b>'<p>не должна быть директорией проекта.</p></translation> </message> <message> <location filename="../Project/PropertiesDialog.py" line="170" /> @@ -67204,12 +67325,12 @@ <translation>Контроль версий недоступен для удаленных проектов.</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="261" /> + <location filename="../Project/PropertiesDialog.py" line="267" /> <source>Source Files ({0});;All Files (*)</source> <translation>Файлы исходников ({0});;Все файлы (*)</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="265" /> + <location filename="../Project/PropertiesDialog.py" line="271" /> <source>All Files (*)</source> <translation>Все файлы (*)</translation> </message> @@ -67250,102 +67371,138 @@ <context> <name>Purge</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="76" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/purge.py" line="83" /> <source>Purge All Files</source> <translation>Зачистить все файлы</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="77" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/purge.py" line="84" /> <source>Do really want to delete all files not tracked by Mercurial (including ignored ones)?</source> <translation>Вы действительно хотите удалить все файлы, не отслеживаемые Mercurial (включая игнорируемые)?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="82" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/purge.py" line="89" /> <source>Purge Files</source> <translation>Зачистить файлы</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="83" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/purge.py" line="90" /> <source>Do really want to delete files not tracked by Mercurial?</source> - <translation>Вы действительно хотите удалить все файлы не отслеживаемые Mercurial?</translation> + <translation>Вы действительно хотите удалить все файлы, не отслеживаемые Mercurial?</translation> </message> </context> <context> <name>PurgeProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="36" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="34" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="36" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="34" /> <source>Purge Files</source> <translation>Зачистить файлы</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="43" /> - <source>Delete files and directories not known to Mercurial</source> - <translation>Удалить файлы и директории, не находящиеся под управлением Mercurial</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="46" /> - <source><b>Purge Files</b><p>This deletes files and directories not known to Mercurial. That means that purge will delete:<ul><li>unknown files (marked with "not tracked" in the status dialog)</li><li>empty directories</li></ul>Note that ignored files will be left untouched.</p></source> - <translation><b>Зачистить файлы</b><p>Удаление файлов и директорий, не находящихся под управлением Mercurial. Это означает что будут удалены:<ul><li>неизвестные файлы (помеченные как "не отслеживаются" в диалоге статус)</li><li>пустые директории</li></ul>Примечание: игнорируемые файлы удалены не будут.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="61" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="60" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="43" /> + <source>Delete not version controlled files and directories</source> + <translation>Удаление неконтролируемых версий файлов и директорий</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="46" /> + <source><b>Purge Files</b><p>This deletes not version controlled files and directories. That means that purge will delete:<ul><li>not version controlled files (marked with "not tracked" in the status dialog)</li><li>empty directories</li></ul>Note that ignored files will be left untouched.</p></source> + <translation><b>Зачистить файлы</b><p> При этом удаляются неконтролируемые версии файлов и директорий. Это означает, что при очистке будут удалены:<ul><li>неконтролируемые версии файлов, (помеченные в диалоговом окне статуса как "не отслеживаемые")</li><li>пустые директории</li></ul>Обратите внимание, что игнорируемые файлы останутся нетронутыми.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="61" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="60" /> <source>Purge All Files</source> <translation>Зачистить все файлы</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="68" /> - <source>Delete files and directories not known to Mercurial including ignored ones</source> - <translation>Удалить файлы и директории, не находящиеся под управлением Mercurial, включая игнорируемые</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="74" /> - <source><b>Purge All Files</b><p>This deletes files and directories not known to Mercurial. That means that purge will delete:<ul><li>unknown files (marked with "not tracked" in the status dialog)</li><li>empty directories</li><li>ignored files and directories</li></ul></p></source> - <translation><b>Зачистить все файлы</b><p>Удаление файлов и директорий, не находящихся под управлением Mercurial. Это означает что будут удалены:<ul><li>неизвестные файлы (помеченные как "не отслеживаются" в диалоге статуса)</li><li>пустые директории</li><li>игнорируемые файлы</li></ul></p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="89" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="68" /> + <source>Delete not version controlled files and directories including ignored ones</source> + <translation>Удаление неконтролируемых версий файлов и директорий, включая игнорируемые</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="74" /> + <source><b>Purge All Files</b><p>This deletes not version controlled files and directories. That means that purge will delete:<ul><li>not version controlled files (marked with "not tracked" in the status dialog)</li><li>empty directories</li><li>ignored files and directories</li></ul></p></source> + <translation><b>Зачистить все файлы</b><p> При этом удаляются неконтролируемые версии файлов и директорий. Это означает, что при очистке будут удалены:<ul><li>неконтролируемые версии файлов, (помеченные в диалоговом окне статуса как "не отслеживаемые")</li><li>пустые директории</li><li>игнорируемые файлы и директории</li></ul></p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="90" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="89" /> + <source>Purge Ignored Files</source> + <translation>Зачистить игнорируемые файлы</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="97" /> + <source>Delete ignored files and directories</source> + <translation>Удаление игнорируемых файлов и директорий</translation> + </message> + <message> + <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><b>Очистить игнорируемые файлы</b><p> При этом удаляются игнорируемые файлы и директории.</p></translation> + </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/PurgeExtension/ProjectHelper.py" line="91" /> + <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/PurgeExtension/ProjectHelper.py" line="98" /> - <source>List files and directories not known to Mercurial</source> - <translation>Список файлов и директорий, не находящихся под управлением Mercurial</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="101" /> - <source><b>List Files to be Purged</b><p>This lists files and directories not known to Mercurial. These would be deleted by the "Purge Files" menu entry.</p></source> - <translation><b>Список файлов для зачистки</b><p>Показывает файлы и директории не находящиеся под управлением Mercurial. Они будут удалены при выборе в меню пункта "Зачистить файлы".</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="111" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="118" /> + <source>List not version controlled files and directories</source> + <translation>Список неконтролируемых версий файлов и директорий</translation> + </message> + <message> + <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><b>Список файлов для зачистки</b><p>Здесь перечислены неконтролируемые версии файлов и директорий. Они будут удалены с помощью пункта меню "Зачистить файлы".</p></translation> + </message> + <message> + <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/PurgeExtension/ProjectHelper.py" line="112" /> + <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/PurgeExtension/ProjectHelper.py" line="119" /> - <source>List files and directories not known to Mercurial including ignored ones</source> - <translation>Список файлов и директорий, не отслеживаемых Mercurial, включая игнорируемые</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="125" /> - <source><b>List All Files to be Purged</b><p>This lists files and directories not known to Mercurial including ignored ones. These would be deleted by the "Purge All Files" menu entry.</p></source> - <translation><b>Список всех файлов для зачистки</b><p>Показывает файлы и директории, не находящиеся под управлением Mercurial, включая игнорируемые. Они будут удалены при выборе в меню пункта "Зачистить все файлы".</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="163" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="139" /> + <source>List not version controlled files and directories including ignored ones</source> + <translation>Список неконтролируемых версий файлов и директорий, включая игнорируемые</translation> + </message> + <message> + <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><b>Список всех файлов для зачистки</b><p>Здесь перечислены неконтролируемые версии файлов и директорий, включая игнорируемые. Они будут удалены с помощью пункта меню "Зачистить все файлы".</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="156" /> + <source>List Ignored Files to be Purged</source> + <translation>Список игнорируемых файлов для зачистки</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="157" /> + <source>List Ignored Files to be Purged...</source> + <translation>Список игнорируемых файлов для зачистки...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="164" /> + <source>List ignored files and directories</source> + <translation>Список игнорируемых файлов и директорий</translation> + </message> + <message> + <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><b>Список игнорируемых файлов для зачистки</b><p>Здесь перечислены игнорируемые файлы и директории. Они будут удалены с помощью пункта меню "Зачистить игнорируемые файлы".</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="206" /> <source>Purge</source> <translation>Purge (зачистка)</translation> </message> @@ -74554,7 +74711,7 @@ <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/Security/translations.py" line="384" /> <source>Use of 'RawSQL()' opens a potential SQL attack vector.</source> - <translation>Использование «RawSQL()» открывает потенциальный вектор атаки SQL.</translation> + <translation>Использование 'RawSQL()' открывает потенциальный вектор атаки SQL.</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/Security/translations.py" line="388" /> @@ -76377,49 +76534,49 @@ <context> <name>Shelve</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="105" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="105" /> <source>Shelve current changes</source> <translation>Отложить текущие изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="151" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="151" /> <source>Restore shelved changes</source> <translation>Восстановить отложенные изменения (Unshelve)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="170" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="170" /> <source>Abort restore operation</source> <translation>Прервать восстановление</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="191" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="191" /> <source>Continue restore operation</source> <translation>Продолжить восстановление</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="211" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="211" /> <source>Select the shelves to be deleted:</source> <translation>Выберите отложенные изменения для удаления:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="231" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="222" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="231" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="222" /> <source>Delete shelves</source> <translation>Удалить отложенные изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="223" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="223" /> <source>Do you really want to delete these shelves?</source> <translation>Вы действительно хотите удалить эти отложенные изменения?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="249" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="242" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="249" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="242" /> <source>Delete all shelves</source> <translation>Удалить все отложенные изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="243" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="243" /> <source>Do you really want to delete all shelved changes?</source> <translation>Вы действительно хотите удалить все отложенные изменения?</translation> </message> @@ -76427,21 +76584,21 @@ <context> <name>ShelveProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="62" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="57" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="52" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="47" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="62" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="57" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="52" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="47" /> <source>Shelve changes</source> <translation>Отложить изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="122" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="74" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="122" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="74" /> <source>Shelve</source> <translation>Отложить изменения (Shelve)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="104" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="104" /> <source>The project should be reread. Do this now?</source> <translation>Проект должен быть перепрочитан. Сделать это сейчас?</translation> </message> @@ -76449,154 +76606,154 @@ <context> <name>ShelveProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="34" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="34" /> <source>Shelve changes</source> <translation>Отложить изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="35" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="35" /> <source>Shelve changes...</source> <translation>Отложить изменения...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="42" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="42" /> <source>Shelve all current changes of the project</source> <translation>Откладывание всех текущих изменений проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="45" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="45" /> <source><b>Shelve changes</b><p>This shelves all current changes of the project.</p></source> <translation><b>Отложить изменения</b><p>Откладывание всех текущие изменения.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="54" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="54" /> <source>Show shelve browser</source> <translation>Браузер отложенных изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="55" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="55" /> <source>Show shelve browser...</source> <translation>Браузер отложенных изменений...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="61" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="61" /> <source>Show a dialog with all shelves</source> <translation>Отображение диалога со всеми отложенными изменениями</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="63" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="63" /> <source><b>Show shelve browser...</b><p>This shows a dialog listing all available shelves. Actions on these shelves may be executed via the context menu.</p></source> <translation><b>Браузер отложенных изменений...</b><p>Отображение диалога со списком всех доступных отложенных изменений. Контекстное меню позволяет манипулировать этими изменениями.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="74" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="74" /> <source>Restore shelved change</source> <translation>Восстановить отложенные изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="75" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="75" /> <source>Restore shelved change...</source> <translation>Восстановить отложенные изменения...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="82" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="82" /> <source>Restore a shelved change to the project directory</source> <translation>Восстановить отложенные изменения в директории проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="85" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="85" /> <source><b>Restore shelved change</b><p>This restore a shelved change to the project directory.</p></source> <translation><b>Восстановить отложенные изменения</b><p>Восстановление отложенных изменений в директории проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="95" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="95" /> <source>Abort restore</source> <translation>Прервать восстановление</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="96" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="96" /> <source>Abort restore...</source> <translation>Прервать восстановление...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="103" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="103" /> <source>Abort the restore operation in progress</source> <translation>Прекратить текущее восстановление</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="106" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="106" /> <source><b>Abort restore</b><p>This aborts the restore operation in progress and reverts already applied changes.</p></source> <translation><b>Прекратить восстановление</b><p>Прекратить текущее восстановление и вернуть уже применённые изменения.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="116" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="116" /> <source>Continue restore</source> <translation>Продолжить восстановление</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="117" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="117" /> <source>Continue restore...</source> <translation>Продолжить восстановление...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="124" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="124" /> <source>Continue the restore operation in progress</source> <translation>Продолжить текущее восстановление</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="127" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="127" /> <source><b>Continue restore</b><p>This continues the restore operation in progress.</p></source> <translation><b>Продолжить восстановление</b><p>Продолжить текущее восстановление.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="136" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="136" /> <source>Delete shelved changes</source> <translation>Удалить отложенные изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="137" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="137" /> <source>Delete shelved changes...</source> <translation>Удалить отложенные изменения...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="144" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="144" /> <source><b>Delete shelved changes...</b><p>This opens a dialog to select the shelved changes to delete and deletes the selected ones.</p></source> <translation><b>Удалить отложенные изменения...</b><p>Открытие диалога выбора отложенных изменений для удаления и удаления выбранных.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="155" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="154" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="155" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="154" /> <source>Delete ALL shelved changes</source> <translation>Удалить ВСЕ отложенные изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="162" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="162" /> <source><b>Delete ALL shelved changes</b><p>This deletes all shelved changes.</p></source> <translation><b>Удалить ВСЕ отложенные изменения</b><p>Удаление всех отложенных изменений.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="231" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="202" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="231" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="202" /> <source>Shelve</source> <translation>Shelve (отложенные изменения)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="218" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="218" /> <source>The project should be reread. Do this now?</source> <translation>Проект должен быть перепрочитан. Сделать это сейчас?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="244" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="244" /> <source>Unshelve</source> <translation>Unshelve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="251" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="251" /> <source>Abort Unshelve</source> <translation>Прекратить Unshelve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="258" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="258" /> <source>Continue Unshelve</source> <translation>Продолжить Unshelve</translation> </message> @@ -79238,44 +79395,6 @@ </message> </context> <context> - <name>Strip</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/strip.py" line="68" /> - <source>Stripping changesets from repository</source> - <translation>Срезка наборов изменений из репозитория</translation> - </message> - </context> - <context> - <name>StripProjectHelper</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="37" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="35" /> - <source>Strip changesets</source> - <translation>Срезать наборы изменений</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="43" /> - <source>Strip changesets from a repository</source> - <translation>Удаление наборов изменений из репозитория</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="45" /> - <source><b>Strip changesets</b><p>This deletes a changeset and all its descendants from a repository. Each removed changeset will be stored in .hg/strip-backup as a bundle file.</p></source> - <translation><b>Срезать наборы изменений</b><p>Удаление набора изменений и всех его потомков из репозитория. Каждый удаленный набор изменений будет сохранен в .hg/strip-backup как bundle-файл.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="91" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="79" /> - <source>Strip</source> - <translation>Strip (срезать изменения)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="92" /> - <source>The project should be reread. Do this now?</source> - <translation>Проект должен быть перепрочитан. Сделать это сейчас?</translation> - </message> - </context> - <context> <name>SubstyleDefinitionDialog</name> <message> <location filename="../Preferences/SubstyleDefinitionDialog.py" line="44" /> @@ -80387,12 +80506,12 @@ <context> <name>SvnDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="165" /> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="168" /> <source>Process Generation Error</source> <translation>Ошибка при запуске процесса</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="166" /> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="169" /> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Невозможно запустить процесс {0}. Убедитесь, что он находится в путях поиска.</translation> </message> @@ -90895,6 +91014,66 @@ </message> </context> <context> + <name>Uncommit</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/uncommit.py" line="64" /> + <source>Undo Local Commit</source> + <translation>Отменить локальную фиксацию</translation> + </message> + </context> + <context> + <name>UncommitProjectBrowserHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="145" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="82" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="72" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="62" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="52" /> + <source>Undo Local Commit</source> + <translation>Отменить локальную фиксацию</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="96" /> + <source>Uncommit</source> + <translation>Uncommit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="126" /> + <source>The project should be reread. Do this now?</source> + <translation>Проект должен быть перепрочитан. Сделать это сейчас?</translation> + </message> + </context> + <context> + <name>UncommitProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="107" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="38" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="36" /> + <source>Undo Local Commit</source> + <translation>Отменить локальную фиксацию</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="44" /> + <source>Undo the effect of a local commit.</source> + <translation>Отменить результаты локальной фиксации.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="46" /> + <source><b>Undo Local Commit</b><p>This undoes the effect of a local commit, returning the affected files to their uncommitted state.</p></source> + <translation><b>Отменить локальную фиксацию</b><p> Это отменяет результаты локальной фиксации, возвращая затронутые файлы в их незафиксированное состояние.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="79" /> + <source>Uncommit</source> + <translation>Uncommit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="95" /> + <source>The project should be reread. Do this now?</source> + <translation>Проект должен быть перепрочитан. Сделать это сейчас?</translation> + </message> + </context> + <context> <name>UnittestExecutor</name> <message> <location filename="../Testing/Interfaces/UnittestExecutor.py" line="52" /> @@ -91543,7 +91722,7 @@ <translation><b>Сохранить севнс...</b><p>Позволяет сохранить текущий сеанс на диск. Открывается диалог для выбора имени файла.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7892" /> + <location filename="../UI/UserInterface.py" line="7893" /> <location filename="../UI/UserInterface.py" line="1955" /> <location filename="../UI/UserInterface.py" line="1948" /> <source>Load session</source> @@ -92876,8 +93055,8 @@ <translation><b>Горячие клавиши</b><p>Определите горячие клавиши приложения согласно вашим предпочтениям.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7600" /> - <location filename="../UI/UserInterface.py" line="7581" /> + <location filename="../UI/UserInterface.py" line="7601" /> + <location filename="../UI/UserInterface.py" line="7582" /> <location filename="../UI/UserInterface.py" line="3402" /> <source>Export Keyboard Shortcuts</source> <translation>Экспорт горячих клавиш</translation> @@ -92899,7 +93078,7 @@ <p>Экспортировать горячие клавиши приложения.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7619" /> + <location filename="../UI/UserInterface.py" line="7620" /> <location filename="../UI/UserInterface.py" line="3421" /> <source>Import Keyboard Shortcuts</source> <translation>Импорт горячих клавиш</translation> @@ -93634,169 +93813,169 @@ </translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7108" /> - <location filename="../UI/UserInterface.py" line="7046" /> - <location filename="../UI/UserInterface.py" line="7002" /> - <location filename="../UI/UserInterface.py" line="6928" /> - <location filename="../UI/UserInterface.py" line="6864" /> - <source>Documentation Missing</source> - <translation>Документация отсутствует</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="7109" /> <location filename="../UI/UserInterface.py" line="7047" /> <location filename="../UI/UserInterface.py" line="7003" /> <location filename="../UI/UserInterface.py" line="6929" /> <location filename="../UI/UserInterface.py" line="6865" /> + <source>Documentation Missing</source> + <translation>Документация отсутствует</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7110" /> + <location filename="../UI/UserInterface.py" line="7048" /> + <location filename="../UI/UserInterface.py" line="7004" /> + <location filename="../UI/UserInterface.py" line="6930" /> + <location filename="../UI/UserInterface.py" line="6866" /> <source><p>The documentation starting point "<b>{0}</b>" could not be found.</p></source> <translation><p>Стартовая директория документации "<b>{0}</b>" не найдена.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7090" /> - <location filename="../UI/UserInterface.py" line="6972" /> - <source>Documentation</source> - <translation>Документация</translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="6973" /> - <source><p>The PyQt{0} documentation starting point has not been configured.</p></source> - <translation><p>Стартовая директория документации PyQt{0} не настроена.</p></translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="7091" /> + <location filename="../UI/UserInterface.py" line="6973" /> + <source>Documentation</source> + <translation>Документация</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="6974" /> + <source><p>The PyQt{0} documentation starting point has not been configured.</p></source> + <translation><p>Стартовая директория документации PyQt{0} не настроена.</p></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7092" /> <source><p>The PySide{0} documentation starting point has not been configured.</p></source> <translation><p>Просмотр документации PySide{0} не настроен.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7270" /> - <location filename="../UI/UserInterface.py" line="7206" /> - <source>Start Web Browser</source> - <translation>Запуск web-браузера</translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="7207" /> - <source>The eric web browser could not be started.</source> - <translation>Невозможно запустить eric web-браузер.</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="7271" /> + <location filename="../UI/UserInterface.py" line="7207" /> + <source>Start Web Browser</source> + <translation>Запуск web-браузера</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7208" /> + <source>The eric web browser could not be started.</source> + <translation>Невозможно запустить eric web-браузер.</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7272" /> <source><p>The eric web browser is not started.</p><p>Reason: {0}</p></source> <translation><p>Eric web-браузер не запущен.</p><p>Причина: {0}</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7317" /> + <location filename="../UI/UserInterface.py" line="7318" /> <source>Open Browser</source> <translation>Открыть браузер</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7317" /> + <location filename="../UI/UserInterface.py" line="7318" /> <source>Could not start a web browser</source> <translation>Невозможно запустить web-браузер</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7621" /> - <location filename="../UI/UserInterface.py" line="7583" /> + <location filename="../UI/UserInterface.py" line="7622" /> + <location filename="../UI/UserInterface.py" line="7584" /> <source>Keyboard Shortcuts File (*.ekj)</source> <translation>Файл горячих клавиш (*.ekj)</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7601" /> + <location filename="../UI/UserInterface.py" line="7602" /> <source><p>The keyboard shortcuts file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Файл горячих клавиш <b>{0}</b> уже существует. Переписать?</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7805" /> + <location filename="../UI/UserInterface.py" line="7806" /> <source>Load crash session...</source> <translation>Загрузить crash-сеанс...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7808" /> + <location filename="../UI/UserInterface.py" line="7809" /> <source>Clean crash sessions...</source> <translation>Очистить crash-сеансы...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7845" /> - <source>Read Session</source> - <translation>Загрузить сеанс</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="7846" /> + <source>Read Session</source> + <translation>Загрузить сеанс</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7847" /> <source><p>The session file <b>{0}</b> could not be read.</p></source> <translation><p>Невозможно прочитать файл сеанса <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7869" /> + <location filename="../UI/UserInterface.py" line="7870" /> <source>Save Session</source> <translation>Сохранить сеанс</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7894" /> - <location filename="../UI/UserInterface.py" line="7871" /> + <location filename="../UI/UserInterface.py" line="7895" /> + <location filename="../UI/UserInterface.py" line="7872" /> <source>eric Session Files (*.esj)</source> <translation>Файлы сеансов eric (*.esj)</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7963" /> - <source>Found Crash Sessions</source> - <translation>Найдены crash-сеансы</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="7964" /> + <source>Found Crash Sessions</source> + <translation>Найдены crash-сеансы</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7965" /> <source>These crash session files were found. Select the one to open. Select 'Cancel' to not open a crash session.</source> <translation>Были найдены следующие файлы crash-сеансов. Выберите один из них для открытия. Выберите 'Отмена', чтобы не открывать crash-сеанс.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="8037" /> - <source>Clean stale crash sessions</source> - <translation>Очистите устаревшие crash-сеансы</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="8038" /> + <source>Clean stale crash sessions</source> + <translation>Очистите устаревшие crash-сеансы</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8039" /> <source>Do you really want to delete these stale crash session files?</source> <translation>Вы действительно хотите удалить эти устаревшие файлы crash-сеансов?</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="8414" /> - <source>Drop Error</source> - <translation>Ошибка Drag&&Drop</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="8415" /> + <source>Drop Error</source> + <translation>Ошибка Drag&&Drop</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8416" /> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> не является файлом</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="8612" /> - <source>Upgrade available</source> - <translation>Доступно обновление</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="8613" /> + <source>Upgrade available</source> + <translation>Доступно обновление</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8614" /> <source><p>A newer version of the <b>eric-ide</b> package is available at <a href="{0}/eric-ide/">PyPI</a>.</p><p>Installed: {1}<br/>Available: <b>{2}</b></p><p>Shall <b>eric-ide</b> be upgraded?</p></source> <translation><p>Новая версия пакета <b>eric-ide</b> доступна по адресу <a href="{0}/eric-ide/">PyPI</a>.</p><p> Установлено: {1}<br/>Доступно: <b>{2}</b></p><p>Должен ли <b>eric-ide</b> быть обновлен?</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="8661" /> - <source>First time usage</source> - <translation>Первое использование</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="8662" /> + <source>First time usage</source> + <translation>Первое использование</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8663" /> <source>eric has not been configured yet. The configuration dialog will be started.</source> <translation>Настройка eric ещё не выполнена. Сейчас будет запущен диалог конфигурации.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="8684" /> + <location filename="../UI/UserInterface.py" line="8685" /> <source>Select Workspace Directory</source> <translation>Выбор директории рабочей области</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="8852" /> - <source>Unsaved Data Detected</source> - <translation>Обнаружены несохраненные данные</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="8853" /> + <source>Unsaved Data Detected</source> + <translation>Обнаружены несохраненные данные</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8854" /> <source>Some editors contain unsaved data. Shall these be saved?</source> <translation>Некоторые редакторы содержат несохраненные данные. Должны ли они быть сохранены?</translation> </message> @@ -100882,8 +101061,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>&Browsing History</source> - <translation>&История просмотров</translation> + <source>Browsing History</source> + <translation>История просмотров</translation> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100922,8 +101101,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>&Search History</source> - <translation>История &поиска</translation> + <source>Search History</source> + <translation>История поиска</translation> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100932,8 +101111,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>Download &History</source> - <translation>История &закачек</translation> + <source>Download History</source> + <translation>История закачек</translation> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100942,8 +101121,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>&Cookies</source> - <translation>&Куки</translation> + <source>Cookies</source> + <translation>Куки</translation> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100952,8 +101131,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>Cached &Web Pages</source> - <translation>К&эшированные страницы</translation> + <source>Cached Web Pages</source> + <translation>Кэшированные страницы</translation> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100962,8 +101141,18 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>Website &Icons</source> - <translation>Иконки &web-сайтов</translation> + <source>Website Icons</source> + <translation>Иконки web-сайтов</translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> + <source>Select to clear the website permissions</source> + <translation>Разрешить отменять разрешения для веб-сайта</translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> + <source>Website Permissions</source> + <translation>Разрешения веб-сайта</translation> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100972,8 +101161,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>Saved &Passwords</source> - <translation>Сохранённые &пароли</translation> + <source>Saved Passwords</source> + <translation>Сохранённые пароли</translation> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100982,8 +101171,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>&Zoom Settings</source> - <translation>&Настройки масштабирования</translation> + <source>Zoom Settings</source> + <translation>Настройки масштабирования</translation> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -101526,6 +101715,16 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/WebBrowserPage.ui" line="0" /> + <source>Select to store website permission settings in memory only.</source> + <translation>Разрешить сохранять настройки разрешений веб-сайта только в памяти.</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserPage.ui" line="0" /> + <source>Do not persist website permissions</source> + <translation>Не сохранять разрешения веб-сайта</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserPage.ui" line="0" /> <source><p>Select to allow reading from all canvas elements.</p> <p><b>Note:</b> Disable this option to prevent canvas fingerprinting.</p></source> <translation><p>Разрешить чтение со всех элементов canvas.</p> @@ -101956,32 +102155,87 @@ <translation><b>Примечание:</b> Высокое значение делителя будет замедлять прокрутку.</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="194" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="78" /> + <source><p>Allow <b>{0}</b> to access your location information?</p></source> + <translation><p>Разрешить <b>{0}</b> доступ к информации о вашем местоположении?</p></translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="83" /> + <source><p>Allow <b>{0}</b> to access your microphone?</p></source> + <translation><p>Разрешить <b>{0}</b> доступ к вашему микрофону?</p></translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="89" /> + <source><p>Allow <b>{0}</b> to access your webcam?</p></source> + <translation><p>Разрешить <b>{0}</b> доступ к вашей веб-камере?</p></translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="95" /> + <source><p>Allow <b>{0}</b> to access your microphone and webcam?</p></source> + <translation><p>Разрешить <b>{0}</b> доступ к вашим микрофону и веб-камере?</p></translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="100" /> + <source><p>Allow <b>{0}</b> to lock your mouse cursor?</p></source> + <translation><p>Разрешить <b>{0}</b> блокировать курсор мыши?< / p></translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="105" /> + <source><p>Allow <b>{0}</b> to capture video of your desktop?</p></source> + <translation><p>Разрешить <b>{0}</b> захватывать видео с вашего рабочего стола?</p></translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="111" /> + <source><p>Allow <b>{0}</b> to capture audio and video of your desktop?</p></source> + <translation><p>Разрешить <b>{0}</b> захватывать аудио и видео с вашего рабочего стола?</p></translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="118" /> + <source><p>Allow <b>{0}</b> to show notifications on your desktop?</p></source> + <translation><p>Разрешить <b>{0}</b> отображать уведомления на вашем рабочем столе?</p></translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="124" /> + <source><p>Allow <b>{0}</b> to read from and write to the clipboard?</p></source> + <translation><p>Разрешить <b>{0}</b> чтение из буфера обмена и запись в него?</p></translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="130" /> + <source><p>Allow <b>{0}</b> to access fonts stored on this machine?</p></source> + <translation><p>Разрешить <b>{0}</b> доступ к шрифтам, хранящимся на этом компьютере?</p></translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="269" /> <source>Suspicuous URL detected</source> <translation>Обнаружен подозрительный URL</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="195" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="270" /> <source><p>The URL <b>{0}</b> was found in the Safe Browsing database.</p>{1}</source> <translation><p>URL <b>{0}</b> был найден в базе Safe Browsing.</p>{1}</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="541" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="396" /> + <source>Permission Request</source> + <translation>Запрос разрешения</translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="636" /> <source>Register Protocol Handler</source> <translation>Зарегистрировать обработчик протокола</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="542" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="637" /> <source><p>Allow the Web Site <b>{0}</b> to handle all <b>{1}</b> links?</p></source> <translation><p>Разрешить веб-сайту <b>{0}</b> обрабатывать все ссылки <b>{1}</b>?</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="631" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="726" /> <source>SSL Info</source> <translation>SSL инфо</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="632" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="727" /> <source>This site does not contain SSL information.</source> <translation>Этот сайт не содержит информации SSL.</translation> </message> @@ -102716,8 +102970,8 @@ <location filename="../WebBrowser/WebAuth/WebBrowserWebAuthDialog.py" line="265" /> <source>{0} %n attempt(s) remaining.</source> <translation> - <numerusform>{0} осталось %n попытка.</numerusform> - <numerusform>{0} осталось %n попытки.</numerusform> + <numerusform>{0} осталась %n попытка.</numerusform> + <numerusform>{0} остались %n попытки.</numerusform> <numerusform>{0} осталось %n попыток.</numerusform> </translation> </message> @@ -104581,15 +104835,15 @@ <translation>Проверить текущий сервер</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5231" /> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5221" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5248" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5238" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2220" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2218" /> <source>IP Address Report</source> <translation>Отчет IP-адреса</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5245" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5262" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2232" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2230" /> <source>Domain Report</source> @@ -104616,8 +104870,8 @@ <translation><b>Горячие клавиши</b><p>Определите горячие клавиши приложения согласно вашим предпочтениям.</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5651" /> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5632" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5675" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5656" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2270" /> <source>Export Keyboard Shortcuts</source> <translation>Экспорт горячих клавиш</translation> @@ -104639,7 +104893,7 @@ <p>Экспортировать горячие клавиши приложения.</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5671" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5695" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2289" /> <source>Import Keyboard Shortcuts</source> <translation>Импорт горячиx клавиш</translation> @@ -104891,100 +105145,100 @@ <translation>Движок системы справки</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4768" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4785" /> <source>System</source> <translation>Система</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4772" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4789" /> <source>ISO</source> <translation>ISO</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4775" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4792" /> <source>Unicode</source> <translation>Юникод</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4778" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4795" /> <source>Windows</source> <translation>Windows</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4781" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4798" /> <source>IBM</source> <translation>IBM</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4784" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4801" /> <source>Apple</source> <translation>Apple</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4787" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4804" /> <source>Other</source> <translation>Другое</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4814" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4831" /> <source>Menu Bar</source> <translation>Строка меню</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4819" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4836" /> <source>Bookmarks</source> <translation>Закладки</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4824" /> - <source>Status Bar</source> - <translation>Строка состояния</translation> - </message> - <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4839" /> - <source>&Show all</source> - <translation>Показать &всё</translation> - </message> - <message> <location filename="../WebBrowser/WebBrowserWindow.py" line="4841" /> + <source>Status Bar</source> + <translation>Строка состояния</translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4856" /> + <source>&Show all</source> + <translation>Показать &всё</translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4858" /> <source>&Hide all</source> <translation>Ск&рыть всё</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5187" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5204" /> <source>VirusTotal Scan</source> <translation>Проверка VirusTotal</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5188" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5205" /> <source><p>The VirusTotal scan could not be scheduled.<p> <p>Reason: {0}</p></source> <translation><p>Невозможно запланировать проверку VirusTotal.<p> <p>Причина: {0}</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5222" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5239" /> <source>Enter a valid IPv4 address in dotted quad notation:</source> <translation>Введите действительный адрес IPv4 в четырехкомпонентой нотации с точками:</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5232" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5249" /> <source>The given IP address is not in dotted quad notation.</source> <translation>Данный IP-адрес приведен не в четырехкомпонентой нотации с точками.</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5246" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5263" /> <source>Enter a valid domain name:</source> <translation>Введите действительное имя домена:</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5673" /> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5634" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5697" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5658" /> <source>Keyboard Shortcuts File (*.ekj)</source> <translation>Файл горячих клавиш (*.ekj)</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5652" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5676" /> <source><p>The keyboard shortcuts file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Файл горячих клавиш <b>{0}</b> уже существует. Переписать?</p></translation> </message> @@ -106090,32 +106344,32 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1383" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1389" /> <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="1955" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1391" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1964" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397" /> <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="1961" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1970" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1403" /> <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="1968" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1404" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1977" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1410" /> <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="1410" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1416" /> <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> @@ -106125,7 +106379,7 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1429" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1435" /> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -106142,38 +106396,38 @@ </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1929" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1938" /> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation><tr><td><b>Головная ревизия #{0}</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1936" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945" /> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation><tr><td><b>Предок #{0}</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1943" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1952" /> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Вершина</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1948" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1957" /> <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="1975" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1984" /> <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="1981" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990" /> <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>
--- a/src/eric7/i18n/eric7_tr.ts Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/i18n/eric7_tr.ts Tue Jan 14 17:29:56 2025 +0100 @@ -7716,18 +7716,18 @@ <translation>Grafik</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="896" /> + <location filename="../Preferences/ConfigurationDialog.py" line="903" /> <location filename="../Preferences/ConfigurationDialog.py" line="228" /> <source>Hex Editor</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1129" /> - <location filename="../Preferences/ConfigurationDialog.py" line="1090" /> - <location filename="../Preferences/ConfigurationDialog.py" line="982" /> - <location filename="../Preferences/ConfigurationDialog.py" line="944" /> - <location filename="../Preferences/ConfigurationDialog.py" line="913" /> - <location filename="../Preferences/ConfigurationDialog.py" line="882" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1136" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1097" /> + <location filename="../Preferences/ConfigurationDialog.py" line="989" /> + <location filename="../Preferences/ConfigurationDialog.py" line="951" /> + <location filename="../Preferences/ConfigurationDialog.py" line="920" /> + <location filename="../Preferences/ConfigurationDialog.py" line="889" /> <location filename="../Preferences/ConfigurationDialog.py" line="785" /> <location filename="../Preferences/ConfigurationDialog.py" line="670" /> <location filename="../Preferences/ConfigurationDialog.py" line="235" /> @@ -7745,7 +7745,7 @@ <translation type="unfinished">Kayıt-Gösterici</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1104" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1111" /> <location filename="../Preferences/ConfigurationDialog.py" line="250" /> <source>MicroPython</source> <translation type="unfinished" /> @@ -7762,8 +7762,9 @@ <translation>Ağ</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1111" /> - <location filename="../Preferences/ConfigurationDialog.py" line="958" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1118" /> + <location filename="../Preferences/ConfigurationDialog.py" line="965" /> + <location filename="../Preferences/ConfigurationDialog.py" line="806" /> <location filename="../Preferences/ConfigurationDialog.py" line="271" /> <source>Network Proxy</source> <translation type="unfinished">Şebeke proxysini kullan</translation> @@ -7774,13 +7775,13 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="927" /> + <location filename="../Preferences/ConfigurationDialog.py" line="934" /> <location filename="../Preferences/ConfigurationDialog.py" line="285" /> <source>PDF Viewer</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="965" /> + <location filename="../Preferences/ConfigurationDialog.py" line="972" /> <location filename="../Preferences/ConfigurationDialog.py" line="292" /> <source>Python Package Management</source> <translation type="unfinished" /> @@ -7791,7 +7792,7 @@ <translation>Eklenti Yöneticisi</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="806" /> + <location filename="../Preferences/ConfigurationDialog.py" line="813" /> <location filename="../Preferences/ConfigurationDialog.py" line="684" /> <location filename="../Preferences/ConfigurationDialog.py" line="306" /> <source>Printer</source> @@ -7808,13 +7809,13 @@ <translation>Qt</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="813" /> + <location filename="../Preferences/ConfigurationDialog.py" line="820" /> <location filename="../Preferences/ConfigurationDialog.py" line="321" /> <source>Security</source> <translation type="unfinished">Güvenlik</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="996" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1003" /> <location filename="../Preferences/ConfigurationDialog.py" line="328" /> <source>Shell</source> <translation>Kabuk</translation> @@ -7830,7 +7831,7 @@ <translation>Şablonlar</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="865" /> + <location filename="../Preferences/ConfigurationDialog.py" line="872" /> <location filename="../Preferences/ConfigurationDialog.py" line="343" /> <source>Tray Starter</source> <translation type="unfinished" /> @@ -7846,7 +7847,7 @@ <translation>Hata Ayıklayıcı</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1003" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1010" /> <location filename="../Preferences/ConfigurationDialog.py" line="698" /> <location filename="../Preferences/ConfigurationDialog.py" line="399" /> <location filename="../Preferences/ConfigurationDialog.py" line="364" /> @@ -7881,14 +7882,14 @@ <translation>Dosyaişleme</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1010" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1017" /> <location filename="../Preferences/ConfigurationDialog.py" line="712" /> <location filename="../Preferences/ConfigurationDialog.py" line="413" /> <source>Searching</source> <translation>Arıyor</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="848" /> + <location filename="../Preferences/ConfigurationDialog.py" line="855" /> <location filename="../Preferences/ConfigurationDialog.py" line="719" /> <location filename="../Preferences/ConfigurationDialog.py" line="648" /> <location filename="../Preferences/ConfigurationDialog.py" line="420" /> @@ -7896,7 +7897,7 @@ <translation>Yazım Kontrolü</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1017" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1024" /> <location filename="../Preferences/ConfigurationDialog.py" line="726" /> <location filename="../Preferences/ConfigurationDialog.py" line="427" /> <source>Style</source> @@ -7919,14 +7920,14 @@ <translation>Dışaaktarım</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1024" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1031" /> <location filename="../Preferences/ConfigurationDialog.py" line="455" /> <source>Autocompletion</source> <translation>Otomatik tamamlama</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1045" /> - <location filename="../Preferences/ConfigurationDialog.py" line="1031" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1052" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1038" /> <location filename="../Preferences/ConfigurationDialog.py" line="483" /> <location filename="../Preferences/ConfigurationDialog.py" line="462" /> <source>QScintilla</source> @@ -7940,13 +7941,13 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1038" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1045" /> <location filename="../Preferences/ConfigurationDialog.py" line="476" /> <source>Calltips</source> <translation>İpuçları</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1052" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1059" /> <location filename="../Preferences/ConfigurationDialog.py" line="740" /> <location filename="../Preferences/ConfigurationDialog.py" line="497" /> <source>Highlighters</source> @@ -7959,21 +7960,21 @@ <translation>Dosyatipi Birleştirme</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1059" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1066" /> <location filename="../Preferences/ConfigurationDialog.py" line="754" /> <location filename="../Preferences/ConfigurationDialog.py" line="511" /> <source>Styles</source> <translation>Stiller</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1066" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1073" /> <location filename="../Preferences/ConfigurationDialog.py" line="761" /> <location filename="../Preferences/ConfigurationDialog.py" line="518" /> <source>Keywords</source> <translation>Anahtar Sözcükler</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1073" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1080" /> <location filename="../Preferences/ConfigurationDialog.py" line="768" /> <location filename="../Preferences/ConfigurationDialog.py" line="525" /> <source>Properties</source> @@ -7990,7 +7991,7 @@ <translation>Yardım</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="820" /> + <location filename="../Preferences/ConfigurationDialog.py" line="827" /> <location filename="../Preferences/ConfigurationDialog.py" line="553" /> <source>Help Documentation</source> <translation>Yardım Belgeleri</translation> @@ -8017,12 +8018,12 @@ <translation>Çokluproje</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1136" /> - <location filename="../Preferences/ConfigurationDialog.py" line="1097" /> - <location filename="../Preferences/ConfigurationDialog.py" line="989" /> - <location filename="../Preferences/ConfigurationDialog.py" line="951" /> - <location filename="../Preferences/ConfigurationDialog.py" line="920" /> - <location filename="../Preferences/ConfigurationDialog.py" line="889" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1143" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1104" /> + <location filename="../Preferences/ConfigurationDialog.py" line="996" /> + <location filename="../Preferences/ConfigurationDialog.py" line="958" /> + <location filename="../Preferences/ConfigurationDialog.py" line="927" /> + <location filename="../Preferences/ConfigurationDialog.py" line="896" /> <location filename="../Preferences/ConfigurationDialog.py" line="792" /> <location filename="../Preferences/ConfigurationDialog.py" line="677" /> <location filename="../Preferences/ConfigurationDialog.py" line="602" /> @@ -8041,47 +8042,47 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="827" /> + <location filename="../Preferences/ConfigurationDialog.py" line="834" /> <location filename="../Preferences/ConfigurationDialog.py" line="627" /> <source>Appearance</source> <translation>Görünüm</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="834" /> - <location filename="../Preferences/ConfigurationDialog.py" line="634" /> - <source>eric Web Browser</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Preferences/ConfigurationDialog.py" line="841" /> + <location filename="../Preferences/ConfigurationDialog.py" line="634" /> + <source>eric Web Browser</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationDialog.py" line="848" /> <location filename="../Preferences/ConfigurationDialog.py" line="641" /> <source>VirusTotal Interface</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1228" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1235" /> <source>Enter search text...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1303" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1310" /> <source>Preferences</source> <translation>Seçenekler</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1309" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1316" /> <source>Please select an entry of the list to display the configuration page.</source> <translation>Lütfen ayarlama sayfasını göstermek için gelen listeyi seçiniz.</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1392" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1399" /> <source>Configuration Page Error</source> <translation>Ayarlama Sayfası Hatası</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1393" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1400" /> <source><p>The configuration page <b>{0}</b> could not be loaded.</p></source> <translation><p>TAyarlama sayfası <b>{0}</b> yüklenemiyor.</p></translation> </message> @@ -10651,12 +10652,12 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="1691" /> + <location filename="../Debugger/DebuggerInterfacePython.py" line="1692" /> <source>Debug Protocol Error</source> <translation type="unfinished" /> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="1692" /> + <location filename="../Debugger/DebuggerInterfacePython.py" line="1693" /> <source><p>The response received from the debugger backend could not be decoded. Please report this issue with the received data to the eric bugs email address.</p><p>Error: {0}</p><p>Data:<br/>{1}</p></source> <translation type="unfinished" /> </message> @@ -22662,64 +22663,147 @@ </message> </context> <context> + <name>Fastexport</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="183" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="174" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="168" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="159" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="133" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="113" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="57" /> + <source>Mercurial Fastexport</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="58" /> + <source><p>The output file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="107" /> + <source>Cancel</source> + <translation type="unfinished">Vazgeç</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="110" /> + <source>%v/%m Changesets</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="116" /> + <source>Exporting repository (time remaining: {0}) ...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="134" /> + <source><p>The repository fastexport process sent an error message.</p><p>{0}</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="160" /> + <source><p>The repository fastexport process finished successfully.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="169" /> + <source><p>The repository fastexport process was cancelled.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="175" /> + <source><p>The repository fastexport process finished with exit code <b>{0}</b>.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="184" /> + <source><p>The repository fastexport process crashed.</p></source> + <translation type="unfinished" /> + </message> + </context> + <context> + <name>FastexportProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="37" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="35" /> + <source>Export to git</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="44" /> + <source>Export the repository as git fast-import stream.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="47" /> + <source><b>Export to git</b><p>This exports the repository as a git fast-import stream.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="79" /> + <source>Fastexport</source> + <translation type="unfinished" /> + </message> + </context> + <context> <name>FeaturePermissionBar</name> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="48" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="50" /> <source>{0} wants to use your position.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="51" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="53" /> <source>{0} wants to use your microphone.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="54" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="56" /> <source>{0} wants to use your camera.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="57" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="59" /> <source>{0} wants to use your microphone and camera.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="60" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="62" /> <source>{0} wants to lock your mouse.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="61" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="63" /> <source>{0} wants to capture video of your screen.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="64" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="66" /> <source>{0} wants to capture audio and video of your screen.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="67" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="69" /> <source>{0} wants to use desktop notifications.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="92" /> - <source>Remember</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="94" /> + <source>Remember</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="96" /> <source>Allow</source> <translation type="unfinished">Kabul etmek</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="95" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="97" /> <source>Deny</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="120" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="122" /> <source>{0} wants to use an unknown feature.</source> <translation type="unfinished" /> </message> @@ -22727,80 +22811,106 @@ <context> <name>FeaturePermissionsDialog</name> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="161" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="143" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="127" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="109" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="93" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="79" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="65" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="49" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="208" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="190" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="170" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="152" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="136" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="118" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="102" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="88" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="74" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="58" /> <source>Host</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="162" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="144" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="128" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="110" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="94" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="80" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="66" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="50" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="209" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="191" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="171" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="153" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="137" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="119" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="103" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="89" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="75" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="59" /> <source>Permission</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="54" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="63" /> <source>Notifications</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="68" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="77" /> <source>Geolocation</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="82" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="91" /> <source>Microphone</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="96" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="105" /> <source>Camera</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="114" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="123" /> <source>Microphone && Camera</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="130" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="139" /> <source>Mouse Lock</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="148" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="157" /> <source>Desktop Video</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="166" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="175" /> <source>Desktop Audio && Video</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="181" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="195" /> + <source>Clipboard</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="213" /> + <source>Local Fonts</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="296" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="253" /> <source>Allow</source> <translation type="unfinished">Kabul etmek</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="182" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="297" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="254" /> <source>Deny</source> <translation type="unfinished" /> </message> <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="255" /> + <source>Always Ask</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="256" /> + <source>Invalid</source> + <translation type="unfinished" /> + </message> + <message> <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.ui" line="0" /> <source>HTML5 Feature Permissions</source> <translation type="unfinished" /> @@ -24671,74 +24781,74 @@ <translation type="unfinished" /> </message> <message> - <location filename="../UI/FindFileWidget.py" line="750" /> + <location filename="../UI/FindFileWidget.py" line="749" /> <source>Invalid search expression</source> <translation type="unfinished">Geçersiz arama ifadesi</translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="751" /> + <location filename="../UI/FindFileWidget.py" line="750" /> <source><p>The search expression is not valid.</p><p>Error: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/FindFileWidget.py" line="878" /> + <location filename="../UI/FindFileWidget.py" line="877" /> <source>{0} / {1}</source> <comment>occurrences / files</comment> <translation type="unfinished" /> </message> <message numerus="yes"> - <location filename="../UI/FindFileWidget.py" line="881" /> + <location filename="../UI/FindFileWidget.py" line="880" /> <source>%n occurrence(s)</source> <translation type="unfinished"> <numerusform /> </translation> </message> <message numerus="yes"> - <location filename="../UI/FindFileWidget.py" line="882" /> + <location filename="../UI/FindFileWidget.py" line="881" /> <source>%n file(s)</source> <translation type="unfinished"> <numerusform /> </translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1081" /> - <location filename="../UI/FindFileWidget.py" line="1056" /> - <location filename="../UI/FindFileWidget.py" line="1042" /> + <location filename="../UI/FindFileWidget.py" line="1080" /> + <location filename="../UI/FindFileWidget.py" line="1055" /> + <location filename="../UI/FindFileWidget.py" line="1041" /> <source>Replace in Files</source> <translation type="unfinished">Dosyalarda yer değiştir</translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1043" /> + <location filename="../UI/FindFileWidget.py" line="1042" /> <source><p>Could not read the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1057" /> + <location filename="../UI/FindFileWidget.py" line="1056" /> <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 type="unfinished" /> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1082" /> + <location filename="../UI/FindFileWidget.py" line="1081" /> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1111" /> + <location filename="../UI/FindFileWidget.py" line="1110" /> <source>Open</source> <translation type="unfinished">Aç</translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1113" /> + <location filename="../UI/FindFileWidget.py" line="1112" /> <source>Copy Path to Clipboard</source> <translation type="unfinished">Yolu Panoya kopyala</translation> </message> <message> + <location filename="../UI/FindFileWidget.py" line="1116" /> + <source>Select All</source> + <translation type="unfinished">Hepsini Seç</translation> + </message> + <message> <location filename="../UI/FindFileWidget.py" line="1117" /> - <source>Select All</source> - <translation type="unfinished">Hepsini Seç</translation> - </message> - <message> - <location filename="../UI/FindFileWidget.py" line="1118" /> <source>Deselect All</source> <translation type="unfinished" /> </message> @@ -26916,37 +27026,37 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="91" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="94" /> <source>Additional Output</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="110" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="113" /> <source>Process canceled.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="124" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="127" /> <source>Process finished successfully.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="126" /> - <source>Process crashed.</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="129" /> + <source>Process crashed.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="132" /> <source>Process finished with exit code {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="195" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="198" /> <source>Process Generation Error</source> <translation type="unfinished">İşlem Üretecinde Hata</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="196" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="199" /> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> @@ -35314,456 +35424,456 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="303" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="309" /> <source>Create project repository</source> <translation>Bilgi havuzu projesi oluştur</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="304" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="310" /> <source>The project repository could not be created.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="338" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="344" /> <source>Creating Mercurial repository</source> <translation>Mercurial kaynak havauzu oluşturuluyor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="359" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="365" /> <source>Initial commit to Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="405" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="411" /> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="516" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="522" /> <source>Commit Changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="517" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="523" /> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="580" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="586" /> <source>Committing changes to Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="679" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="685" /> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="719" /> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="774" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="780" /> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="829" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="835" /> <source>Renaming {0}</source> <translation>Yenşden adlandırılıyor {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="964" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="970" /> <source>Tagging in the Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1011" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1000" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1017" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006" /> <source>Revert changes</source> <translation type="unfinished">Değişiklikleri başa döndür</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1001" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1007" /> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1012" /> - <source>Do you really want to revert all changes of the project?</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1018" /> + <source>Do you really want to revert all changes of the project?</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1024" /> <source>Reverting changes</source> <translation>Değişiklikler eski haline alınıyor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1064" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1070" /> <source>Merging</source> <translation>Birleştiriliyor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1095" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1109" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101" /> <source>Re-Merge</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1102" /> <source>Do you really want to re-merge these files or directories?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1104" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1110" /> <source>Do you really want to re-merge the project?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1114" /> <source>Re-Merging</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1131" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1137" /> <source>Current branch tip</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1314" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1320" /> <source>Mercurial command</source> <translation>Mercurial komut</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1492" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1498" /> <source>Copying {0}</source> <translation>Kopyalanıyor {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1758" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1746" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1764" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1752" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743" /> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1759" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1765" /> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"><p>Dosya <b>{0}</b> okunamıyor.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2457" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2446" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2436" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1835" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2455" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844" /> <source>Apply changegroups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1838" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1847" /> <source>Pulling from a remote Mercurial repository</source> <translation>Uzak Mercurial kaynak havuzundan çekiliyor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1884" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1893" /> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2027" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2036" /> <source>Marking as 'unresolved'</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2029" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038" /> <source>Marking as 'resolved'</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2051" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060" /> <source>Aborting uncommitted merge</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2084" /> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086" /> - <source>Created new branch <{0}>.</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2095" /> + <source>Created new branch <{0}>.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2104" /> <source>Showing current branch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2184" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193" /> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2200" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209" /> <source>Showing the combined configuration settings</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2224" /> <source>Showing aliases for remote repositories</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2230" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239" /> <source>Recovering from interrupted transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254" /> <source>Identifying project directory</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2291" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2300" /> <source>Create .hgignore file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2292" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301" /> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p><b>{0}</b> dosyası halihazırda bulunuyor. Üzerine yazılsın mı?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2395" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2369" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2351" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2404" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2378" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2360" /> <source>Create changegroup</source> <translation>Değişimgrubu oluştur</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2353" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362" /> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Değiştirme grubu Dosyaları (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2370" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2379" /> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2409" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2418" /> <source>Preview changegroup</source> <translation>Değişimgrubu öngörünümü</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2438" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2411" /> - <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> - <translation>Mercurial Değişimgrubu Dosyaları (*.hg);;Tüm Dosyalar (*)</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2447" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2420" /> + <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> + <translation>Mercurial Değişimgrubu Dosyaları (*.hg);;Tüm Dosyalar (*)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2456" /> <source>Shall the working directory be updated?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2479" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2488" /> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2501" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2510" /> <source>Mercurial Bisect ({0})</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2527" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2536" /> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2576" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2557" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2585" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2566" /> <source>Backing out changeset</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2558" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2567" /> <source>No revision given. Aborting...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2587" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2602" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2596" /> <source>Rollback last transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2588" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2597" /> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2657" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2666" /> <source>Import Patch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2707" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2716" /> <source>Export Patches</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2749" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2758" /> <source>Change Phase</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2804" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813" /> <source>Copy Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2843" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2852" /> <source>Copy Changesets (Continue)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2853" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2862" /> <source>Copy Changesets (Stop)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2863" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2872" /> <source>Copy Changesets (Abort)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2887" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2896" /> <source>Create Unversioned Archive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2902" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2911" /> <source>Delete All Backups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2903" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2912" /> <source><p>Do you really want to delete all backup bundles stored in the backup area?<br/><b>{0}</b></p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2994" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2974" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2963" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2983" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2972" /> <source>Add Sub-repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3033" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2964" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3042" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2973" /> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2975" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2984" /> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3051" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3060" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3004" /> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3050" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3032" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3018" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3059" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3027" /> <source>Remove Sub-repositories</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3019" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3028" /> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3296" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3138" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3147" /> <source>Mercurial Command Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3139" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3148" /> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3297" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3321" /> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3420" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3444" /> <source>Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3437" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3461" /> <source>Delete Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3438" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3462" /> <source>Select the bookmark to be deleted:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3449" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3473" /> <source>Delete Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3476" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3500" /> <source>Rename Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3518" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3542" /> <source>Move Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3600" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3624" /> <source>Pull Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3601" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3625" /> <source>Select the bookmark to be pulled:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3613" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3637" /> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3641" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3665" /> <source>Push Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3642" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3666" /> <source>Select the bookmark to be push:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3657" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3681" /> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished" /> </message> @@ -36606,42 +36716,42 @@ <context> <name>HgClient</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="98" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="100" /> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="147" /> - <source>Did not receive the 'hello' message.</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="149" /> + <source>Did not receive the 'hello' message.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="151" /> <source>Received data on unexpected channel.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="154" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="156" /> <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="159" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="161" /> <source>'capabilities' message did not contain any capability.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="168" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="170" /> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="173" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="175" /> <source>'encoding' message did not contain any encoding.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="385" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="387" /> <source>For message see output dialog.</source> <translation type="unfinished" /> </message> @@ -37004,6 +37114,11 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="0" /> + <source>%v/%m</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="0" /> <source>Errors</source> <translation>Hatalar</translation> </message> @@ -37047,6 +37162,11 @@ <source>Alt+P</source> <translation type="unfinished">Alt+P</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="211" /> + <source>Time remaining: {0}</source> + <translation type="unfinished" /> + </message> </context> <context> <name>HgDiffDialog</name> @@ -37226,6 +37346,69 @@ </message> </context> <context> + <name>HgFastexportConfigDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>fastexport Configuration</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the path of the file for the exported marks.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the path of the output file.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Revisions:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the path of the file containing already exported marks.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Author Map:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Import Marks:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Export Marks:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Output File:</source> + <translation type="unfinished">Çıktı Dosyası:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the revisions, tags or branches to be exported (separated by comma).</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the path of the author map file.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.py" line="42" /> + <source>Text Files (*.txt);;All Files (*)</source> + <translation type="unfinished">Metin Dosyaları (*.txt);;Tüm Dosyalar (*)</translation> + </message> + </context> + <context> <name>HgGpgSignDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="0" /> @@ -38037,7 +38220,7 @@ <translation type="unfinished">Görünüm</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3049" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3063" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298" /> <source>Select Branches</source> <translation type="unfinished" /> @@ -38078,7 +38261,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2218" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2227" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> <source>Copy Changesets</source> <translation type="unfinished" /> @@ -38135,8 +38318,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2312" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2295" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2321" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2304" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="387" /> <source>Switch</source> <translation type="unfinished">Değiştirmek</translation> @@ -38167,263 +38350,270 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2430" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1622" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="415" /> - <source>Pull Changes</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="418" /> - <source>Pull changes from a remote repository</source> - <translation type="unfinished">Değişiklileri uzak kaynak havuzundan çek</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="420" /> + <source>Pull Selected Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="419" /> + <source>Pull selected changes from a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="423" /> + <source>Pull All Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="427" /> + <source>Pull all changes from a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="430" /> <source>Pull Large Files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="422" /> - <source>Pull large files for selected revisions</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="428" /> - <source>Push Selected Changes</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="432" /> - <source>Push changes of the selected changeset and its ancestors to a remote repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="439" /> - <source>Push All Changes</source> + <source>Pull large files for selected revisions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="438" /> + <source>Push Selected Changes</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="442" /> - <source>Push all changes to a remote repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="448" /> - <source>Create Changegroup</source> + <source>Push changes of the selected changeset and its ancestors to a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="449" /> + <source>Push All Changes</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="452" /> + <source>Push all changes to a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="458" /> + <source>Create Changegroup</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="462" /> <source>Create a changegroup file containing the selected changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="455" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="465" /> <source><b>Create Changegroup</b> <p>This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2569" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="468" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2583" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="478" /> <source>Apply Changegroup</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="472" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="482" /> <source>Apply the currently viewed changegroup file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="489" /> <source>Sign Revisions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="483" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="493" /> <source>Add a signature for the selected revisions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="487" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="497" /> <source>Verify Signatures</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="491" /> - <source>Verify all signatures there may be for the selected revision</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2476" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498" /> - <source>Strip Changesets</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="501" /> + <source>Verify all signatures there may be for the selected revision</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="508" /> + <source>Strip Changesets</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="511" /> <source>Strip changesets from a repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="506" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="516" /> <source>Select All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="509" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="519" /> <source>Deselect All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="958" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="934" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="911" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="885" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="968" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="944" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="921" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="895" /> <source>Mercurial Error</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1266" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1276" /> <source>{0} (large file)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1532" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1542" /> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1543" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1553" /> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1701" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1620" /> - <source>Pull Selected Changes</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2570" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2477" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2431" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2313" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2219" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2584" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2491" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2322" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2228" /> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Projenin yeniden okunması gerekiyor. Şimdi yapılsın mı?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2296" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2305" /> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2341" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2350" /> <source>Define Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2342" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2351" /> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2371" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2380" /> <source>Move Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2372" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2381" /> <source>Select the bookmark to be moved to changeset '{0}':</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2444" /> + <source>Pull Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2727" /> <source>Find Commit</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2714" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728" /> <source>'{0}' was not found.</source> <translation type="unfinished">'{0}' bulunamadı.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2774" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2788" /> <source>Generating differences ...</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2775" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2789" /> <source>Differences</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2794" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2808" /> <source>No differences available. Get some more log entries.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2796" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2810" /> <source>No differences available.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2807" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2821" /> <source>Differences to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2823" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2837" /> <source>Diff to Parent {0}{1}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2846" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2860" /> <source>There is no difference.</source> <translation type="unfinished">Herhangi bir farklılık bulunamadı.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2999" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2983" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2965" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3013" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2997" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2979" /> <source>Save Diff</source> <translation type="unfinished">Farklılıkları Kaydet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2967" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2981" /> <source>Patch Files (*.diff)</source> <translation type="unfinished">Patch Dosyaları (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2984" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2998" /> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"><p>Yama dosyası <b>{0}</b> zaten var. Üzerine yazılsın mı?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3000" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3014" /> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation type="unfinished"><p><b>{0}</b>yama kaydedilemedi.<br>Sebep: {1}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3031" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3045" /> <source>closed</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3032" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3046" /> <source>inactive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3041" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3055" /> <source>{0} ({1})</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3050" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3064" /> <source>Select the branches to be shown (none for 'All'):</source> <translation type="unfinished" /> </message> @@ -38572,6 +38762,10 @@ <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation type="unfinished" /> </message> + <message> + <source>Pull changes from a remote repository</source> + <translation type="vanished">Değişiklileri uzak kaynak havuzundan çek</translation> + </message> </context> <context> <name>HgMergeDialog</name> @@ -38933,208 +39127,213 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="282" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="309" /> + <source>Other Functions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="335" /> <source>Extensions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="718" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="604" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="556" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="451" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="308" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="774" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="659" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="611" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="505" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="361" /> <source>Version Control</source> <translation>Sürüm Kontrol</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="734" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="620" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="467" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="324" /> - <source>Commit changes to repository...</source> - <translation>Yapılan değişiklekleri kaynak havuzuna teslim et...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="742" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="628" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="475" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="332" /> - <source>Add to repository</source> - <translation>Kaynak havuzuna ekle</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="748" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="481" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="338" /> - <source>Remove from repository (and disk)</source> - <translation>Kaynak havuzundan kaldır (ve diskten)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1012" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="999" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="487" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="344" /> - <source>Remove from repository only</source> - <translation>Yalnızca kaynak havuzundan kaldır</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="639" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="349" /> - <source>Copy</source> - <translation type="unfinished">Kopyala</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="641" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="351" /> - <source>Move</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="646" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="356" /> - <source>Show log browser</source> - <translation>Kayıt gözatıcısını gösted</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="755" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="653" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="494" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="363" /> - <source>Show status</source> - <translation>Durumu Göster</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="762" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="660" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="501" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="370" /> - <source>Show differences</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="376" /> - <source>Show differences side-by-side</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="768" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="666" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="507" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="382" /> - <source>Show differences (extended)</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="388" /> - <source>Show differences side-by-side (extended)</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="394" /> - <source>Show annotated file</source> - <translation>Açıklama dosyalarını göster</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="398" /> - <source>Show annotated file with skip list</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="402" /> - <source>Create skip list file</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="775" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="673" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="514" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="408" /> - <source>Revert changes</source> - <translation>Değişiklikleri başa döndür</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="779" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="677" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="518" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="412" /> - <source>Conflicts resolved</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="781" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="679" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="520" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="414" /> - <source>Conflicts unresolved</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="783" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="681" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="522" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="416" /> - <source>Re-Merge</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="787" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="685" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="571" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="526" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="420" /> - <source>Select all local file entries</source> - <translation>tüm yerel dosyalırın girişini seç</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="790" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="688" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="574" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="529" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="423" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="675" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="521" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="377" /> + <source>Commit changes to repository...</source> + <translation>Yapılan değişiklekleri kaynak havuzuna teslim et...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="799" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="684" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="530" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="386" /> + <source>Add to repository</source> + <translation>Kaynak havuzuna ekle</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="805" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="690" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="536" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="392" /> + <source>Remove from repository (and disk)</source> + <translation>Kaynak havuzundan kaldır (ve diskten)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1069" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1056" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="542" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="398" /> + <source>Remove from repository only</source> + <translation>Yalnızca kaynak havuzundan kaldır</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="695" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="403" /> + <source>Copy</source> + <translation type="unfinished">Kopyala</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="697" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="405" /> + <source>Move</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="702" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="410" /> + <source>Show log browser</source> + <translation>Kayıt gözatıcısını gösted</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="812" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="709" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="549" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="417" /> + <source>Show status</source> + <translation>Durumu Göster</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="819" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="716" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="556" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="424" /> + <source>Show differences</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="430" /> + <source>Show differences side-by-side</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="825" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="722" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="562" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="436" /> + <source>Show differences (extended)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="442" /> + <source>Show differences side-by-side (extended)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="448" /> + <source>Show annotated file</source> + <translation>Açıklama dosyalarını göster</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="452" /> + <source>Show annotated file with skip list</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="456" /> + <source>Create skip list file</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="832" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="729" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="569" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="462" /> + <source>Revert changes</source> + <translation>Değişiklikleri başa döndür</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="836" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="733" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="573" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="466" /> + <source>Conflicts resolved</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="735" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="575" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="468" /> + <source>Conflicts unresolved</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="840" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="737" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="577" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="470" /> + <source>Re-Merge</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="844" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="741" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="581" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="474" /> + <source>Select all local file entries</source> + <translation>tüm yerel dosyalırın girişini seç</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="847" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="744" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="629" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="584" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="477" /> <source>Select all versioned file entries</source> <translation>Giriş yapılan tüm dosyaları seç</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="793" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="691" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="577" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="532" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="426" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="850" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="747" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="632" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="587" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="480" /> <source>Select all local directory entries</source> <translation>Tüm yerel dizin kalemlerini seç</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="797" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="695" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="581" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="536" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="430" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="854" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="751" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="591" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="484" /> <source>Select all versioned directory entries</source> <translation>Giriş yapılan tüm dizinleri seç</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="801" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="699" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="585" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="540" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="434" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="858" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="755" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="640" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="595" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="488" /> <source>Configure...</source> <translation type="unfinished">Ayarlanıyor...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="916" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="973" /> <source>Create {0} file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="917" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="974" /> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished"><p><b>{0}</b> dosyası halihazırda bulunuyor. Üzerine yazılsın mı?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1013" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1000" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1070" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1057" /> <source>Do you really want to remove these files from the repository?</source> <translation>Bu dosyaları gerçekten kaynak havuzundan kaldırmak istiyor musunuz?</translation> </message> @@ -39142,1513 +39341,1518 @@ <context> <name>HgProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="126" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="135" /> <source>New from repository</source> <translation>Kaynak havuzundan yeni</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="128" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="137" /> <source>&New from repository...</source> <translation>Kay&nak havuzundan yeni...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="135" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="144" /> <source>Create (clone) a new project from a Mercurial repository</source> <translation>Mercurial proje havuzundan yeni bir proje oluştur(klonla)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="138" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="147" /> <source><b>New from repository</b><p>This creates (clones) a new local project from a Mercurial repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="150" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="148" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="159" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="157" /> <source>Show incoming log</source> <translation>Giren günlük kaydını göster</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="156" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="165" /> <source>Show the log of incoming changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="158" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="167" /> <source><b>Show incoming log</b><p>This shows the log of changes coming into the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="170" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="168" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="179" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="177" /> <source>Pull changes</source> <translation>Değişiklikleri çek</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="176" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="185" /> <source>Pull changes from a remote repository</source> <translation>Değişiklileri uzak kaynak havuzundan çek</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="178" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="187" /> <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository.</p></source> <translation><b>Değişiklikleri çek</b><p>Bu uzaktaki bir kaynak havuzundan yerel koynak havuzuna değişiklileri çeker.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="188" /> - <source>Update from repository</source> - <translation>Kaynak Havuzundan güncelle</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="190" /> - <source>&Update from repository</source> - <translation>Kaynak Hav&uzundan güncelle</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="197" /> + <source>Update from repository</source> + <translation>Kaynak Havuzundan güncelle</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="199" /> + <source>&Update from repository</source> + <translation>Kaynak Hav&uzundan güncelle</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="206" /> <source>Update the local project from the Mercurial repository</source> <translation>Mercurial kaynak havuzundan yerel projeyi güncelle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="200" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="209" /> <source><b>Update from repository</b><p>This updates the local project from the Mercurial repository.</p></source> <translation><b>Kaynak havuzundan güncelle</b><p>Bu güncelleme yerel projeyi Mercural kaunak havuzundan günceller.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="210" /> - <source>Commit changes to repository</source> - <translation>Yapılan değişiklekleri kaynak havuzuna teslim et</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="212" /> - <source>&Commit changes to repository...</source> - <translation>Yapılan değişiklekleri kaynak ha&vuzuna teslim et...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="219" /> + <source>Commit changes to repository</source> + <translation>Yapılan değişiklekleri kaynak havuzuna teslim et</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="221" /> + <source>&Commit changes to repository...</source> + <translation>Yapılan değişiklekleri kaynak ha&vuzuna teslim et...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="228" /> <source>Commit changes to the local project to the Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="231" /> <source><b>Commit changes to repository</b><p>This commits changes to the local project to the Mercurial repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="234" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="232" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="243" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="241" /> <source>Show outgoing log</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="240" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="249" /> <source>Show the log of outgoing changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="242" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251" /> <source><b>Show outgoing log</b><p>This shows the log of changes outgoing out of the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="254" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="252" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261" /> <source>Push changes</source> <translation>değişiklikleri kabul et</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="260" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="269" /> <source>Push changes to a remote repository</source> <translation>Uzak kaynak havuzuna değişiklikleri gönder</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="262" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271" /> <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="274" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="272" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281" /> <source>Push changes (force)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="290" /> <source>Push changes to a remote repository with force option</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="284" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293" /> <source><b>Push changes (force)</b><p>This pushes changes from the local repository to a remote repository using the 'force' option.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="294" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="303" /> <source>Export from repository</source> <translation>Kaynak havuzundan ihraç et</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="296" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="305" /> <source>&Export from repository...</source> <translation>Dışarı kaynak havuzundan ihraç &et...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="302" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="311" /> <source>Export a project from the repository</source> <translation>Dışa Kaynak havuzundan proje aktar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="313" /> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation><b>Kaynak havuzundan dışa aktar</b><p>Bu kaynak havuzundan bir projeyi dışa aktarır.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="313" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="324" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322" /> <source>Show log browser</source> <translation>Kayıt gözatıcısını gösted</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="331" /> <source>Show a dialog to browse the log of the local project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="334" /> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="336" /> - <source>Show differences</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="338" /> - <source>Show &difference</source> - <translation>Farkları gös&ter</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="345" /> + <source>Show differences</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347" /> + <source>Show &difference</source> + <translation>Farkları gös&ter</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="354" /> <source>Show the difference of the local project to the repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="357" /> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="360" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="358" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="369" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="367" /> <source>Show differences (extended)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="367" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376" /> <source>Show the difference of revisions of the project to the repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="370" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379" /> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="380" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389" /> <source>Show status</source> <translation>Durumu Göster</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="391" /> <source>Show &status...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="397" /> <source>Show the status of the local project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390" /> - <source><b>Show status</b><p>This shows the status of the local project.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="399" /> - <source>Show Summary</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="401" /> - <source>Show summary...</source> + <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408" /> + <source>Show Summary</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="410" /> + <source>Show summary...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="417" /> <source>Show summary information of the working directory status</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="411" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420" /> <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="430" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="430" /> <source>Show heads</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="432" /> <source>Show the heads of the repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="425" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="434" /> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="434" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="443" /> <source>Show parents</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="441" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450" /> <source>Show the parents of the repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="443" /> - <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="452" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="452" /> + <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461" /> <source>Show tip</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="463" /> <source>Show the tip of the repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="456" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="465" /> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462" /> - <source>Revert changes</source> - <translation>Değişiklikleri başa döndür</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464" /> - <source>Re&vert changes</source> - <translation>Değişiklikleri ba&şa döndür</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471" /> + <source>Revert changes</source> + <translation>Değişiklikleri başa döndür</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="473" /> + <source>Re&vert changes</source> + <translation>Değişiklikleri ba&şa döndür</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="480" /> <source>Revert all changes made to the local project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483" /> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2110" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2129" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492" /> <source>Merge</source> <translation>Birleştir</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="485" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494" /> <source>Mer&ge changes...</source> <translation>De&ğişiklikleri birleştir...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501" /> <source>Merge changes of a revision into the local project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="495" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="504" /> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="506" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="515" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514" /> <source>Commit Merge</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521" /> <source>Commit all the merged changes.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="523" /> <source><b>Commit a merge</b><p>This commits a merge working directory</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="523" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="533" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="532" /> <source>Abort Merge</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="531" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540" /> <source>Abort an uncommitted merge and lose all changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="543" /> <source><b>Abort uncommitted merge</b><p>This aborts an uncommitted merge causing all changes to be lost.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="546" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="544" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="553" /> <source>Re-Merge</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="553" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="562" /> <source>Re-Merge all conflicting, unresolved files of the project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="556" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="565" /> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="575" /> <source>Show conflicts</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="576" /> <source>Show conflicts...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="583" /> <source>Show a dialog listing all files with conflicts</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586" /> <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596" /> <source>Conflicts resolved</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="597" /> <source>Con&flicts resolved</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604" /> <source>Mark all conflicts of the local project as resolved</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="607" /> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617" /> <source>Conflicts unresolved</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625" /> <source>Mark all conflicts of the local project as unresolved</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628" /> <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638" /> <source>Tag in repository</source> <translation>Kaynak havuzu etiketi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640" /> <source>&Tag in repository...</source> <translation>Kaynak havuzu e&tiketi...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="637" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646" /> <source>Tag the local project in the repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="639" /> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648" /> - <source>List tags</source> - <translation>Etiketleri listele</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="649" /> - <source>List tags...</source> - <translation>Etiketleri listele...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655" /> - <source>List tags of the project</source> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657" /> - <source><b>List tags</b><p>This lists the tags of the project.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663" /> - <source>List branches</source> - <translation>Branşlar listesi</translation> + <source>List tags</source> + <translation>Etiketleri listele</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="658" /> + <source>List tags...</source> + <translation>Etiketleri listele...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="664" /> - <source>List branches...</source> - <translation>Branşlar listesi...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670" /> - <source>List branches of the project</source> - <translation>Prosenin branşlar listesi</translation> + <source>List tags of the project</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666" /> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672" /> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation><b>Branş listesi</b><p>Bu listeler prosenin branş listeleridir.</p></translation> + <source>List branches</source> + <translation>Branşlar listesi</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673" /> + <source>List branches...</source> + <translation>Branşlar listesi...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="679" /> + <source>List branches of the project</source> + <translation>Prosenin branşlar listesi</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681" /> - <source>Create branch</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="683" /> - <source>Create &branch...</source> - <translation type="unfinished" /> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation><b>Branş listesi</b><p>Bu listeler prosenin branş listeleridir.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="690" /> + <source>Create branch</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692" /> + <source>Create &branch...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699" /> <source>Create a new branch for the local project in the repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="693" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="702" /> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712" /> <source>Push new branch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721" /> <source>Push the current branch of the local project as a new named branch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="717" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726" /> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="738" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736" /> <source>Close branch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="745" /> <source>Close the current branch of the local project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748" /> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="758" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757" /> <source>Show current branch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="756" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765" /> <source>Show the current branch of the project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="759" /> - <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768" /> - <source>Switch</source> - <translation>Değiştirmek</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770" /> - <source>S&witch...</source> - <translation>Deği&ştirmek...</translation> + <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> + <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777" /> + <source>Switch</source> + <translation>Değiştirmek</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="779" /> + <source>S&witch...</source> + <translation>Deği&ştirmek...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786" /> <source>Switch the working directory to another revision</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="780" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="789" /> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799" /> <source>Cleanup</source> <translation>Temizle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799" /> <source>Cleanu&p</source> <translation>Temi&zle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="792" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801" /> <source>Cleanup the local project</source> <translation>Yerel projeyi temizle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794" /> - <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> - <translation><b>Temizle</b><p>Bu yerel projeyi sıfırlar.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="803" /> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation><b>Temizle</b><p>Bu yerel projeyi sıfırlar.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="812" /> <source>Execute command</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813" /> <source>E&xecute command...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="811" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="820" /> <source>Execute an arbitrary Mercurial command</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="814" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="823" /> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="824" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833" /> <source>Configure</source> <translation>Yapılandırma</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="834" /> <source>Configure...</source> <translation>Ayarlanıyor...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="841" /> <source>Show the configuration dialog with the Mercurial page selected</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="835" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="844" /> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854" /> <source>Edit user configuration</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855" /> <source>Edit user configuration...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="862" /> <source>Show an editor to edit the user configuration file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="856" /> - <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865" /> + <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874" /> <source>Edit repository configuration</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875" /> <source>Edit repository configuration...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="873" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882" /> <source>Show an editor to edit the repository configuration file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="876" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885" /> <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895" /> <source>Show combined configuration settings</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896" /> <source>Show combined configuration settings...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="894" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903" /> <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909" /> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919" /> <source>Show paths</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="911" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="920" /> <source>Show paths...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="918" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="927" /> <source>Show the aliases for remote repositories</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="921" /> - <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930" /> - <source>Verify repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="931" /> - <source>Verify repository...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937" /> - <source>Verify the integrity of the repository</source> + <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="939" /> - <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> + <source>Verify repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="940" /> + <source>Verify repository...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="946" /> + <source>Verify the integrity of the repository</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="948" /> + <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="957" /> <source>Recover</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="948" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="957" /> <source>Recover...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="951" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960" /> <source>Recover from an interrupted transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="954" /> - <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="963" /> - <source>Identify</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964" /> - <source>Identify...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="970" /> - <source>Identify the project directory</source> + <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="972" /> + <source>Identify</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973" /> + <source>Identify...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979" /> + <source>Identify the project directory</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="981" /> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="981" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="990" /> <source>Create .hgignore</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="989" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="998" /> <source>Create a .hgignore file with default values</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="992" /> - <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001" /> - <source>Create changegroup</source> - <translation>Değişimgrubu oluştur</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1003" /> - <source>Create changegroup...</source> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010" /> + <source>Create changegroup</source> + <translation>Değişimgrubu oluştur</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1012" /> + <source>Create changegroup...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1019" /> <source>Create changegroup file collecting changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1013" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1022" /> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1023" /> - <source>Preview changegroup</source> - <translation>Değişimgrubu öngörünümü</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1025" /> - <source>Preview changegroup...</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032" /> + <source>Preview changegroup</source> + <translation>Değişimgrubu öngörünümü</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1034" /> + <source>Preview changegroup...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041" /> <source>Preview a changegroup file containing a collection of changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044" /> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2244" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1045" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2263" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054" /> <source>Apply changegroups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1047" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056" /> <source>Apply changegroups...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063" /> <source>Apply one or several changegroup files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066" /> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1067" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076" /> <source>Mark as "good"</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1077" /> <source>Mark as "good"...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1075" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1084" /> <source>Mark a selectable changeset as good</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1078" /> - <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1087" /> - <source>Mark as "bad"</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088" /> - <source>Mark as "bad"...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1094" /> - <source>Mark a selectable changeset as bad</source> + <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1096" /> - <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> + <source>Mark as "bad"</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1097" /> + <source>Mark as "bad"...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103" /> + <source>Mark a selectable changeset as bad</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105" /> + <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1114" /> <source>Skip</source> <translation>Atla</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1114" /> <source>Skip...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1107" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116" /> <source>Skip a selectable changeset</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1109" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118" /> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1115" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1115" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124" /> <source>Reset</source> <translation>Başadön</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1117" /> - <source>Reset the bisect search data</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119" /> - <source><b>Reset</b><p>This resets the bisect search data.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1126" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1125" /> + <source>Reset the bisect search data</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128" /> + <source><b>Reset</b><p>This resets the bisect search data.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1135" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134" /> <source>Back out changeset</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1142" /> <source>Back out changes of an earlier changeset</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1145" /> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1145" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1155" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154" /> <source>Rollback last transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1152" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161" /> <source>Rollback the last transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1163" /> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1176" /> - <source>Serve project repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1177" /> - <source>Serve project repository...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183" /> - <source>Serve the project repository</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185" /> + <source>Serve project repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1186" /> + <source>Serve project repository...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1192" /> + <source>Serve the project repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1194" /> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2301" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1194" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1203" /> <source>Import Patch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1196" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1205" /> <source>Import Patch...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1202" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211" /> <source>Import a patch from a patch file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1204" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1213" /> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1214" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1223" /> <source>Export Patches</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1225" /> <source>Export Patches...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1222" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1231" /> <source>Export revisions to patch files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1224" /> - <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233" /> - <source>Change Phase</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234" /> - <source>Change Phase...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1240" /> - <source>Change the phase of revisions</source> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1242" /> + <source>Change Phase</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1243" /> + <source>Change Phase...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1249" /> + <source>Change the phase of revisions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251" /> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2343" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1804" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1253" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2362" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1822" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1262" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1260" /> <source>Copy Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1259" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1268" /> <source>Copies changesets from another branch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1261" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270" /> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1273" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1272" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1282" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1281" /> <source>Continue Copying Session</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1280" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1289" /> <source>Continue the last copying session after conflicts were resolved</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1283" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1292" /> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1294" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1293" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1303" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1302" /> <source>Stop Copying Session</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1310" /> <source>Stop the interrupted copying session</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1304" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1313" /> <source><b>Stop Copying Session</b><p>This stops the interrupted copying session.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1314" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1313" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1323" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1322" /> <source>Abort Copying Session</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1321" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330" /> <source>Abort the interrupted copying session and rollback</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1324" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1333" /> <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1334" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1343" /> <source>Add</source> <translation type="unfinished">Ekle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1336" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1345" /> <source>Add...</source> <translation type="unfinished">Ekle...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1342" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1351" /> <source>Add a sub-repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1344" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1353" /> <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1350" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1359" /> <source>Remove</source> <translation type="unfinished">Kaldır</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1352" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1361" /> <source>Remove...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1358" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367" /> <source>Remove sub-repositories</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1360" /> - <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1369" /> - <source>Create unversioned archive</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1371" /> - <source>Create unversioned archive...</source> + <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1378" /> + <source>Create unversioned archive</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1380" /> + <source>Create unversioned archive...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1387" /> <source>Create an unversioned archive from the repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1381" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1390" /> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1391" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1400" /> <source>List bookmarks</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1393" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1402" /> <source>List bookmarks...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1399" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1408" /> <source>List bookmarks of the project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1401" /> - <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1410" /> - <source>Define bookmark</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1412" /> - <source>Define bookmark...</source> + <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1419" /> + <source>Define bookmark</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1421" /> + <source>Define bookmark...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1428" /> <source>Define a bookmark for the project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1422" /> - <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1431" /> - <source>Delete bookmark</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1433" /> - <source>Delete bookmark...</source> + <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1440" /> + <source>Delete bookmark</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1442" /> + <source>Delete bookmark...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1449" /> <source>Delete a bookmark of the project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1443" /> - <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1452" /> - <source>Rename bookmark</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1454" /> - <source>Rename bookmark...</source> + <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1461" /> + <source>Rename bookmark</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1463" /> + <source>Rename bookmark...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1470" /> <source>Rename a bookmark of the project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1464" /> - <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1473" /> + <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1482" /> <source>Move bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1475" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1484" /> <source>Move bookmark...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1481" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1490" /> <source>Move a bookmark of the project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1483" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1492" /> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1495" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1493" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1504" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1502" /> <source>Show incoming bookmarks</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1502" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1511" /> <source>Show a list of incoming bookmarks</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1505" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1514" /> <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1517" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1515" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1526" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1524" /> <source>Pull bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1524" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1533" /> <source>Pull a bookmark from a remote repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1527" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1536" /> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1539" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1537" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1548" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1546" /> <source>Pull current bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1546" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1555" /> <source>Pull the current bookmark from a remote repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1549" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1558" /> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1560" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1558" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1569" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1567" /> <source>Show outgoing bookmarks</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1567" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1576" /> <source>Show a list of outgoing bookmarks</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1570" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1579" /> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1582" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1580" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1591" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1589" /> <source>Push bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1589" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1598" /> <source>Push a bookmark to a remote repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1592" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1601" /> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1604" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1602" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1613" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1611" /> <source>Push current bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1611" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1620" /> <source>Push the current bookmark to a remote repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1614" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1623" /> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1626" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1624" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1635" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1633" /> <source>Push all bookmarks</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1633" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1642" /> <source>Push all bookmarks to a remote repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1636" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1645" /> <source><b>Push all bookmarks</b><p>This pushes all bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1647" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1645" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1656" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1654" /> <source>Delete all backups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1654" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1663" /> <source>Delete all backup bundles stored in the backup area</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1657" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1666" /> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1699" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1708" /> <source>Administration</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1724" /> - <source>Specials</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1733" /> + <source>Specials</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1742" /> <source>Changegroup Management</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1740" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1749" /> <source>Patch Management</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1746" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1755" /> <source>Bisect</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1754" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1763" /> <source>Tags</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1761" /> - <source>Branches</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1770" /> + <source>Branches</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1779" /> <source>Bookmarks</source> <translation type="unfinished">Yerimleri</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1791" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1800" /> + <source>Other Functions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1809" /> <source>Extensions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1813" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1831" /> <source>Sub-Repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1818" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1836" /> <source>Merge Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1903" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1901" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1922" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1920" /> <source>Mercurial</source> <translation type="unfinished">Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2054" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2073" /> <source>Pull</source> <translation>Çekmek</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2391" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2375" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2360" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2344" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2323" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2302" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2245" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2055" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2410" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2394" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2379" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2363" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2342" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2321" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2264" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2074" /> <source>The project should be reread. Do this now?</source> <translation>Projenin yeniden okunması gerekiyor. Şimdi yapılsın mı?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2322" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2341" /> <source>Revert Changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2359" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2378" /> <source>Copy Changesets (Continue)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2374" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2393" /> <source>Copy Changesets (Stop)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2390" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2409" /> <source>Copy Changesets (Abort)</source> <translation type="unfinished" /> </message> @@ -40656,7 +40860,7 @@ <context> <name>HgPurgeListDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/HgPurgeListDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/HgPurgeListDialog.ui" line="0" /> <source>Purge List</source> <translation type="unfinished" /> </message> @@ -41826,87 +42030,87 @@ <context> <name>HgShelveBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Mercurial Shelve Browser</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Name</source> <translation type="unfinished">Adı</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Age</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Message</source> <translation type="unfinished">Mesaj</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Statistics</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>File</source> <translation type="unfinished">Dosya</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Lines added</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Lines deleted</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Errors</source> <translation type="unfinished">Hatalar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source><b>Mercurial shelve errors</b><p>This shows possible error messages of the hg shelve command.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="58" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="58" /> <source>&Refresh</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="60" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="60" /> <source>Press to refresh the list of shelves</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="69" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="69" /> <source>Restore selected shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="72" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="72" /> <source>Delete selected shelves</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="75" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="75" /> <source>Delete all shelves</source> <translation type="unfinished" /> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="290" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="290" /> <source>%n file(s) changed</source> <translation> <numerusform /> @@ -41914,7 +42118,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="292" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="292" /> <source>%n line(s) inserted</source> <translation> <numerusform /> @@ -41922,7 +42126,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="295" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="295" /> <source>%n line(s) deleted</source> <translation> <numerusform /> @@ -41933,57 +42137,57 @@ <context> <name>HgShelveDataDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Name:</source> <translation type="unfinished">Adı:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Enter a name for the shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Date, Time:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Enter the commit date and time for the shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>yyyy-MM-dd HH:mm</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Message:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Enter a message for the shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Mark new/missing files as added/removed</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Select to shelve, but keep the changes in the working directory</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Shelve, but keep changes</source> <translation type="unfinished" /> </message> @@ -41991,7 +42195,7 @@ <context> <name>HgShelvesSelectionDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelvesSelectionDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelvesSelectionDialog.ui" line="0" /> <source>Mercurial Shelve Selection</source> <translation type="unfinished" /> </message> @@ -42295,124 +42499,44 @@ <context> <name>HgStripDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Strip Changesets</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>&Revision</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> <source>Select to specify a revision by number</source> - <translation type="unfinished">Gözden geçirme numarasının açıkça belirtmeyi seç</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Gözden geçirme numarasının açıkça belirtmeyi seç</translation> + </message> + <message> <source>Number</source> - <translation type="unfinished">Numara</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Numara</translation> + </message> + <message> <source>Enter a revision number</source> - <translation type="unfinished">Gözden geçirme numarası gir</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to specify a revision by changeset id</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Gözden geçirme numarası gir</translation> + </message> + <message> <source>Id:</source> - <translation type="unfinished">Id:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Id:</translation> + </message> + <message> <source>Enter a changeset id</source> - <translation type="unfinished">Değişiklik set kimliğini gir</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to specify a revision by a tag</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Değişiklik set kimliğini gir</translation> + </message> + <message> <source>Tag:</source> - <translation type="unfinished">Etiket:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Etiket:</translation> + </message> + <message> <source>Enter a tag name</source> - <translation type="unfinished">Etiket adı gir</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to specify a revision by a branch</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Etiket adı gir</translation> + </message> + <message> <source>Branch:</source> - <translation type="unfinished">Sınıf(Branş):</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Sınıf(Branş):</translation> + </message> + <message> <source>Enter a branch name</source> - <translation type="unfinished">Bir branş adı giriniz</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">Bir branş adı giriniz</translation> + </message> + <message> <source>Expression:</source> - <translation type="unfinished">İfade:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enter a revision set expression</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Bookmark:</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enter a bookmark name</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to enforce removal of changesets</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enforce Operation</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to not create backup bundles</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>No Backup</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to keep the current working directory state</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Keep Working Directory</source> - <translation type="unfinished" /> + <translation type="vanished">İfade:</translation> </message> </context> <context> @@ -42919,29 +43043,124 @@ </message> </context> <context> + <name>HgUncommitDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Undo Local Commit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Commit Message</source> + <translation type="unfinished">Teslimat mesajı</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Enter the log message.</source> + <translation type="unfinished">Kayıt mesajı gir.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source><b>Log Message</b> +<p>Enter the log message for the uncommit action.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Recent commit messages</source> + <translation type="unfinished">Geçmiş teslimet mesajları</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Select a recent commit message to use</source> + <translation type="unfinished">Geçmiş kayıt mesajlarından seç</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Select to allow an empty commit after undoing it.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Allow empty commit after undoing commit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Select to allow undoing the commit with outstanding changes.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Allow undoing commit with outstanding changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Author</source> + <translation type="unfinished">Yazar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Enter author name to override the configured user:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Enter an author name in order to override the configured one</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Select to give date and time information</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Date and Time</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Date/Time:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Enter the date and time to be used</source> + <translation type="unfinished" /> + </message> + <message> + <source><b>Log Message</b> +<p>Enter the log message for the commit action.</p></source> + <translation type="vanished"><b>Kayıt Mesajı</b> +<p>Teslim işlemi için kayıt mesajı gir.</p></translation> + </message> + </context> + <context> <name>HgUnshelveDataDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Mercurial Unshelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Name:</source> <translation type="unfinished">Adı:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Enter the name of the shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Select to keep the shelved change</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Keep shelved change</source> <translation type="unfinished" /> </message> @@ -43011,22 +43230,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> @@ -43042,52 +43261,42 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the Purge 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>Purge</source> + <source>Histedit</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the queues extension</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Queues</source> + <source>Select to activate the GPG 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>GPG</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Rebase</source> + <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 shelve extension</source> + <source>Fastexport</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Shelve</source> + <source>Select to activate the uncommit extension</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the strip extension</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Strip</source> + <source>Uncommit</source> <translation type="unfinished" /> </message> <message> @@ -43307,32 +43516,32 @@ <translation type="unfinished">Varsayılan</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="527" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="474" /> <source>Delete Host Fingerprint</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="528" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="475" /> <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="644" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="591" /> <source>Delete Host Minimum Protocol</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="645" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="592" /> <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="708" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="655" /> <source>Edit User Configuration</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="709" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="656" /> <source>You will loose all changes made in this dialog. Shall the data be saved first?</source> <translation type="unfinished" /> </message> @@ -43411,17 +43620,17 @@ <context> <name>HgUtilities</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="130" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="132" /> <source>The hg process finished with the exit code {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="134" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="136" /> <source>The hg process did not finish within 30s.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="138" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="140" /> <source>Could not start the hg executable.</source> <translation type="unfinished" /> </message> @@ -50725,13 +50934,13 @@ <name>Lexers</name> <message> <location filename="../QScintilla/Lexers/__init__.py" line="412" /> - <location filename="../Preferences/__init__.py" line="599" /> + <location filename="../Preferences/__init__.py" line="598" /> <source>Python Files (*.py *.py3)</source> <translation type="unfinished">Python Dosyaları (*.py *.py3)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="505" /> - <location filename="../Preferences/__init__.py" line="602" /> + <location filename="../Preferences/__init__.py" line="601" /> <source>Python3 Files (*.py)</source> <translation>Python Dosyaları (*.py3)</translation> </message> @@ -52570,8 +52779,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> @@ -53930,7 +54139,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> @@ -60163,74 +60372,12 @@ </message> <message> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to install the selected package</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to install the selected package to the user site</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to show details for the selected entry</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Toggle to show or hide the search window</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Package</source> + <source>Press to refresh the lists</source> <translation type="unfinished" /> </message> <message> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Enter the search term for the package name</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Enter search term</source> - <translation type="unfinished">Arama kriterlerini giriniz</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to start the search</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to search for more packages</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Version</source> - <translation type="unfinished">Sürüm</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Released</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Description</source> - <translation type="unfinished">Açıklama</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to refresh the lists</source> + <source>Press to install a package.</source> <translation type="unfinished" /> </message> <message> @@ -60250,6 +60397,17 @@ </message> <message> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Press to show details for the selected entry</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Press to remove leftovers of an upgrade or uninstall run.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> <source>Select to show only locally-installed packages</source> <translation type="unfinished" /> </message> @@ -60293,6 +60451,13 @@ <message> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Package</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> <source>Installed</source> <translation type="unfinished" /> </message> @@ -60387,319 +60552,337 @@ <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="199" /> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Search Package:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Enter package name to search for.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Press to open a web browser for searching.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="83" /> <source>pip Menu</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="233" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="113" /> <source>Author:</source> <translation type="unfinished">Yazar:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="234" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="114" /> <source>Author Email:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="235" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="115" /> <source>Classifiers:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="236" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="116" /> <source>Entry Points:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="237" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="117" /> <source>Files:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="238" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="118" /> <source>Homepage:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="239" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="119" /> <source>Installer:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="240" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="120" /> <source>License:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="241" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="121" /> <source>Location:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="242" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="122" /> <source>Metadata Version:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="243" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="123" /> <source>Name:</source> <translation type="unfinished">Adı:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="244" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="124" /> <source>Project URLs:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="245" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="125" /> <source>Requires:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="246" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="126" /> <source>Required By:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="247" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="127" /> <source>Summary:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="248" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="128" /> <source>Version:</source> <translation type="unfinished">Sürüm:</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="450" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="335" /> <source>Getting installed packages...</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="478" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="363" /> <source>Getting outdated packages...</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1231" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1051" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1038" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1002" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="735" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="729" /> + <source>Cleanup Environment</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="730" /> + <source>The environment cleanup was successful.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="736" /> + <source>Some leftover package directories could not been removed. Delete them manually.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="834" /> <source>Search PyPI</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1003" /> - <source><p>Received an error while searching for <b>{0}</b>.</p><p>Error: {1}</p></source> - <translation type="unfinished" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="835" /> + <source><p>No package details info for <b>{0}</b> available.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="854" /> + <source>Pip</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="856" /> + <source>Install Pip</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="859" /> + <source>Install Pip to User-Site</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="862" /> + <source>Repair Pip</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="869" /> + <source>Install</source> + <translation type="unfinished">Kur</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1048" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="871" /> + <source>Install Packages</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="874" /> + <source>Install Local Package</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="877" /> + <source>Re-Install Selected Packages</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="884" /> + <source>Requirements/Constraints</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="886" /> + <source>Install Requirements</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="889" /> + <source>Uninstall Requirements</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="892" /> + <source>Generate Requirements...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="896" /> + <source>Install from 'pyproject.toml'</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="900" /> + <source>Uninstall from 'pyproject.toml'</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="905" /> + <source>Generate Constraints...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="912" /> + <source>Cache</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="914" /> + <source>Show Cache Info...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="917" /> + <source>Show Cached Files...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="920" /> + <source>Remove Cached Files...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="923" /> + <source>Purge Cache...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="940" /> + <source>Show Licenses...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="944" /> + <source>Check Vulnerabilities</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="948" /> + <source>Update Vulnerability Database</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="952" /> + <source>Create SBOM file</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="959" /> + <source>Edit User Configuration...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="962" /> + <source>Edit Environment Configuration...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="967" /> + <source>Configure...</source> + <translation type="unfinished">Ayarlanıyor...</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1211" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1198" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1187" /> + <source>Edit Configuration</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1212" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1199" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1188" /> + <source>No valid configuration path determined. Aborting</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1421" /> + <source>{0} {1}</source> + <comment>package name, package version</comment> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1442" /> + <source>Affected Version:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1445" /> + <source>Advisory:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1580" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1555" /> + <source>unknown</source> + <translation type="unfinished">bilinmeyen</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1577" /> + <source>any</source> + <translation type="unfinished" /> + </message> + <message> + <source>Enter search term</source> + <translation type="vanished">Arama kriterlerini giriniz</translation> + </message> + <message> + <source>Version</source> + <translation type="vanished">Sürüm</translation> + </message> + <message> + <source>Description</source> + <translation type="vanished">Açıklama</translation> </message> <message numerus="yes"> - <location filename="../PipInterface/PipPackagesWidget.py" line="1018" /> <source>%n package(s) found.</source> - <translation type="unfinished"> + <translation type="vanished"> <numerusform /> <numerusform /> </translation> </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1025" /> - <source>Showing first {0} packages found.</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1044" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1039" /> - <source><p>There were no results for <b>{0}</b>.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1052" /> - <source><p>There were no more results for <b>{0}</b>.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1232" /> - <source><p>No package details info for <b>{0}</b> available.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1251" /> - <source>Pip</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1253" /> - <source>Install Pip</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1256" /> - <source>Install Pip to User-Site</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1259" /> - <source>Repair Pip</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1266" /> - <source>Install</source> - <translation type="unfinished">Kur</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1445" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1268" /> - <source>Install Packages</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1271" /> - <source>Install Local Package</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1274" /> - <source>Re-Install Selected Packages</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1281" /> - <source>Requirements/Constraints</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1283" /> - <source>Install Requirements</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1286" /> - <source>Uninstall Requirements</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1289" /> - <source>Generate Requirements...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1293" /> - <source>Install from 'pyproject.toml'</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1297" /> - <source>Uninstall from 'pyproject.toml'</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1302" /> - <source>Generate Constraints...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1309" /> - <source>Cache</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1311" /> - <source>Show Cache Info...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1314" /> - <source>Show Cached Files...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1317" /> - <source>Remove Cached Files...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1320" /> - <source>Purge Cache...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1337" /> - <source>Show Licenses...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1341" /> - <source>Check Vulnerabilities</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1345" /> - <source>Update Vulnerability Database</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1349" /> - <source>Create SBOM file</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1356" /> - <source>Edit User Configuration...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1359" /> - <source>Edit Environment Configuration...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1364" /> - <source>Configure...</source> - <translation type="unfinished">Ayarlanıyor...</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1608" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1595" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1584" /> - <source>Edit Configuration</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1609" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1596" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1585" /> - <source>No valid configuration path determined. Aborting</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1818" /> - <source>{0} {1}</source> - <comment>package name, package version</comment> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1839" /> - <source>Affected Version:</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1842" /> - <source>Advisory:</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1977" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1952" /> - <source>unknown</source> - <translation type="unfinished">bilinmeyen</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1974" /> - <source>any</source> - <translation type="unfinished" /> - </message> </context> <context> <name>PipPackagesWindow</name> @@ -61532,64 +61715,69 @@ <name>PluginRepositoryWidget</name> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="124" /> - <source>Stable</source> - <translation>Dengeli</translation> + <source>Obsolete</source> + <translation type="unfinished" /> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="125" /> - <source>Unstable</source> - <translation>Dengesiz</translation> + <source>Stable</source> + <translation>Dengeli</translation> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="126" /> - <source>Obsolete</source> - <translation type="unfinished" /> + <source>Unknown</source> + <translation>Bilinmeyen</translation> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="127" /> - <source>Unknown</source> - <translation>Bilinmeyen</translation> - </message> - <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="179" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="139" /> - <source>Update</source> - <translation>Güncelle</translation> + <source>Unstable</source> + <translation>Dengesiz</translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="128" /> + <source>Upgrade Available</source> + <translation type="unfinished" /> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="182" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="145" /> - <source>Download</source> - <translation>İndir</translation> - </message> - <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="153" /> - <source>Download & Install</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="188" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="161" /> - <source>Cancel</source> - <translation>Vazgeç</translation> - </message> - <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="167" /> - <source>Install</source> - <translation type="unfinished">Kur</translation> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="142" /> + <source>Update</source> + <translation>Güncelle</translation> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="185" /> - <source>Download && Install</source> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="148" /> + <source>Download</source> + <translation>İndir</translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="156" /> + <source>Download & Install</source> <translation type="unfinished" /> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="191" /> - <source>Close && Install</source> - <translation>Kapat && Kur</translation> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="164" /> + <source>Cancel</source> + <translation>Vazgeç</translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="170" /> + <source>Install</source> + <translation type="unfinished">Kur</translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="188" /> + <source>Download && Install</source> + <translation type="unfinished" /> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="194" /> + <source>Close && Install</source> + <translation>Kapat && Kur</translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="197" /> <source>Close</source> <translation type="unfinished">Kapat</translation> </message> @@ -61641,97 +61829,102 @@ <translation>İhtiyaç duyulan eklentiler indirildi.</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="603" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="591" /> <source>Plugins Repository URL Changed</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="604" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="592" /> <source>The URL of the Plugins Repository has changed. Select the "Update" button to get the new repository file.</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="613" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="601" /> <source>Read plugins repository file</source> <translation>Kaynak havuzu eklentiler dosyasını oku</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="614" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="602" /> <source><p>The plugins repository file <b>{0}</b> could not be read. Select Update</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="623" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="611" /> <source>No plugin repository file available. Select Update.</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="627" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="615" /> <source>New: <b>{0}</b></source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="629" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="617" /> <source>Local Updates: <b>{0}</b></source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="632" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="620" /> <source>Remote Updates: <b>{0}</b></source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="705" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="673" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="693" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="661" /> <source>Error downloading file</source> <translation>Dosya yüklenirken hata</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="706" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="674" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="694" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="662" /> <source><p>Could not download the requested file from {0}.</p><p>Error: {1}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="677" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="665" /> <source>No connection to Internet.</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="849" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="810" /> <source>up-to-date</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="852" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="813" /> <source>new download available</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="856" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="818" /> <source>update installable</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="860" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="823" /> <source>updated download available</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="864" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="828" /> <source>error determining status</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1269" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1239" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1002" /> + <source>{0}. {1}</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1346" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1316" /> <source>Cleanup of Plugin Downloads</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1273" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1242" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1350" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1319" /> <source><p>The plugin download <b>{0}</b> could not be deleted.</p><p>Reason: {1}</p></source> <translation type="unfinished" /> </message> @@ -61739,17 +61932,17 @@ <context> <name>PluginRepositoryWindow</name> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1126" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1203" /> <source>Process Generation Error</source> <translation>İşlem Üretecinde Hata</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1127" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1204" /> <source><p>Could not start the process.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>İşlem başlatılamıyor.<br>Bu durum büyük olasılıkla şundan kaynaklanıyto <b>{0}</b>.</p></translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1131" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1208" /> <source>OK</source> <translation>TAMAM</translation> </message> @@ -62126,18 +62319,18 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1908" /> + <location filename="../Preferences/__init__.py" line="1909" /> <source>Export Preferences</source> <translation>Seçenekleri Dışa Aktar</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1937" /> - <location filename="../Preferences/__init__.py" line="1910" /> + <location filename="../Preferences/__init__.py" line="1938" /> + <location filename="../Preferences/__init__.py" line="1911" /> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/__init__.py" line="1935" /> + <location filename="../Preferences/__init__.py" line="1936" /> <source>Import Preferences</source> <translation>Seçenekleri İçe Aktar</translation> </message> @@ -62699,79 +62892,79 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="273" /> + <location filename="../Preferences/ProgramsDialog.py" line="275" /> <source>PyPI Package Management</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="525" /> - <location filename="../Preferences/ProgramsDialog.py" line="522" /> - <location filename="../Preferences/ProgramsDialog.py" line="506" /> - <location filename="../Preferences/ProgramsDialog.py" line="376" /> - <location filename="../Preferences/ProgramsDialog.py" line="309" /> - <location filename="../Preferences/ProgramsDialog.py" line="292" /> + <location filename="../Preferences/ProgramsDialog.py" line="527" /> + <location filename="../Preferences/ProgramsDialog.py" line="524" /> + <location filename="../Preferences/ProgramsDialog.py" line="508" /> + <location filename="../Preferences/ProgramsDialog.py" line="378" /> + <location filename="../Preferences/ProgramsDialog.py" line="311" /> + <location filename="../Preferences/ProgramsDialog.py" line="294" /> <source>(unknown)</source> <translation>(bilinmeyen)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="296" /> + <location filename="../Preferences/ProgramsDialog.py" line="298" /> <source>Spell Checker - PyEnchant</source> <translation>Heceleme Kontrolü - PyEnchant</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="313" /> + <location filename="../Preferences/ProgramsDialog.py" line="315" /> <source>Source Highlighter - Pygments</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="320" /> + <location filename="../Preferences/ProgramsDialog.py" line="322" /> <source>MicroPython - MPY Cross Compiler</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="327" /> + <location filename="../Preferences/ProgramsDialog.py" line="329" /> <source>MicroPython - ESP Tool</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="338" /> + <location filename="../Preferences/ProgramsDialog.py" line="340" /> <source>MicroPython - PyBoard Flasher</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="348" /> + <location filename="../Preferences/ProgramsDialog.py" line="350" /> <source>MicroPython - STLink Info</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="358" /> + <location filename="../Preferences/ProgramsDialog.py" line="360" /> <source>MicroPython - STLink Flasher</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="380" /> + <location filename="../Preferences/ProgramsDialog.py" line="382" /> <source>Code Assistant - Jedi</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="460" /> + <location filename="../Preferences/ProgramsDialog.py" line="462" /> <source>(not configured)</source> <translation>(ayarlanmadı)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="495" /> + <location filename="../Preferences/ProgramsDialog.py" line="497" /> <source>(module not found)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="528" /> + <location filename="../Preferences/ProgramsDialog.py" line="530" /> <source>(not executable)</source> <translation>(yürütülemez)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="574" /> + <location filename="../Preferences/ProgramsDialog.py" line="576" /> + <location filename="../Preferences/ProgramsDialog.py" line="544" /> <location filename="../Preferences/ProgramsDialog.py" line="542" /> - <location filename="../Preferences/ProgramsDialog.py" line="540" /> <source>(not found)</source> <translation>(bulunamadı)</translation> </message> @@ -66976,7 +67169,7 @@ <translation>Alt+R</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="306" /> + <location filename="../Project/PropertiesDialog.py" line="312" /> <location filename="../Project/PropertiesDialog.py" line="71" /> <source>None</source> <translation type="unfinished">Yok</translation> @@ -67002,12 +67195,12 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="261" /> + <location filename="../Project/PropertiesDialog.py" line="267" /> <source>Source Files ({0});;All Files (*)</source> <translation>Kaynak Dosyaları ({0});; Tüm Dosyalar (*)</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="265" /> + <location filename="../Project/PropertiesDialog.py" line="271" /> <source>All Files (*)</source> <translation type="unfinished">Tüm Dosyalar (*)</translation> </message> @@ -67048,22 +67241,22 @@ <context> <name>Purge</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="76" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/purge.py" line="83" /> <source>Purge All Files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="77" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/purge.py" line="84" /> <source>Do really want to delete all files not tracked by Mercurial (including ignored ones)?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="82" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/purge.py" line="89" /> <source>Purge Files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="83" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/purge.py" line="90" /> <source>Do really want to delete files not tracked by Mercurial?</source> <translation type="unfinished" /> </message> @@ -67071,79 +67264,115 @@ <context> <name>PurgeProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="36" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="34" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="36" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="34" /> <source>Purge Files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="43" /> - <source>Delete files and directories not known to Mercurial</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="46" /> - <source><b>Purge Files</b><p>This deletes files and directories not known to Mercurial. That means that purge will delete:<ul><li>unknown files (marked with "not tracked" in the status dialog)</li><li>empty directories</li></ul>Note that ignored files will be left untouched.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="61" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="60" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="43" /> + <source>Delete not version controlled files and directories</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="46" /> + <source><b>Purge Files</b><p>This deletes not version controlled files and directories. That means that purge will delete:<ul><li>not version controlled files (marked with "not tracked" in the status dialog)</li><li>empty directories</li></ul>Note that ignored files will be left untouched.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="61" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="60" /> <source>Purge All Files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="68" /> - <source>Delete files and directories not known to Mercurial including ignored ones</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="74" /> - <source><b>Purge All Files</b><p>This deletes files and directories not known to Mercurial. That means that purge will delete:<ul><li>unknown files (marked with "not tracked" in the status dialog)</li><li>empty directories</li><li>ignored files and directories</li></ul></p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="89" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="68" /> + <source>Delete not version controlled files and directories including ignored ones</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="74" /> + <source><b>Purge All Files</b><p>This deletes not version controlled files and directories. That means that purge will delete:<ul><li>not version controlled files (marked with "not tracked" in the status dialog)</li><li>empty directories</li><li>ignored files and directories</li></ul></p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="90" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="89" /> + <source>Purge Ignored Files</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="97" /> + <source>Delete ignored files and directories</source> + <translation type="unfinished" /> + </message> + <message> + <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/PurgeExtension/ProjectHelper.py" line="91" /> + <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/PurgeExtension/ProjectHelper.py" line="98" /> - <source>List files and directories not known to Mercurial</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="101" /> - <source><b>List Files to be Purged</b><p>This lists files and directories not known to Mercurial. These would be deleted by the "Purge Files" menu entry.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="111" /> + <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="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="131" /> <source>List All Files to be Purged</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="112" /> + <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/PurgeExtension/ProjectHelper.py" line="119" /> - <source>List files and directories not known to Mercurial including ignored ones</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="125" /> - <source><b>List All Files to be Purged</b><p>This lists files and directories not known to Mercurial 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/PurgeExtension/ProjectHelper.py" line="163" /> + <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="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="156" /> + <source>List Ignored Files to be Purged</source> + <translation type="unfinished" /> + </message> + <message> + <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="164" /> + <source>List ignored files and directories</source> + <translation type="unfinished" /> + </message> + <message> + <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="206" /> <source>Purge</source> <translation type="unfinished" /> </message> @@ -75982,49 +76211,49 @@ <context> <name>Shelve</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="105" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="105" /> <source>Shelve current changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="151" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="151" /> <source>Restore shelved changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="170" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="170" /> <source>Abort restore operation</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="191" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="191" /> <source>Continue restore operation</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="211" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="211" /> <source>Select the shelves to be deleted:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="231" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="222" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="231" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="222" /> <source>Delete shelves</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="223" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="223" /> <source>Do you really want to delete these shelves?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="249" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="242" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="249" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="242" /> <source>Delete all shelves</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="243" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="243" /> <source>Do you really want to delete all shelved changes?</source> <translation type="unfinished" /> </message> @@ -76032,21 +76261,21 @@ <context> <name>ShelveProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="62" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="57" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="52" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="47" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="62" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="57" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="52" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="47" /> <source>Shelve changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="122" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="74" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="122" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="74" /> <source>Shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="104" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="104" /> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Projenin yeniden okunması gerekiyor. Şimdi yapılsın mı?</translation> </message> @@ -76054,154 +76283,154 @@ <context> <name>ShelveProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="34" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="34" /> <source>Shelve changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="35" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="35" /> <source>Shelve changes...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="42" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="42" /> <source>Shelve all current changes of the project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="45" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="45" /> <source><b>Shelve changes</b><p>This shelves all current changes of the project.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="54" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="54" /> <source>Show shelve browser</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="55" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="55" /> <source>Show shelve browser...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="61" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="61" /> <source>Show a dialog with all shelves</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="63" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="63" /> <source><b>Show shelve browser...</b><p>This shows a dialog listing all available shelves. Actions on these shelves may be executed via the context menu.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="74" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="74" /> <source>Restore shelved change</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="75" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="75" /> <source>Restore shelved change...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="82" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="82" /> <source>Restore a shelved change to the project directory</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="85" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="85" /> <source><b>Restore shelved change</b><p>This restore a shelved change to the project directory.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="95" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="95" /> <source>Abort restore</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="96" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="96" /> <source>Abort restore...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="103" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="103" /> <source>Abort the restore operation in progress</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="106" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="106" /> <source><b>Abort restore</b><p>This aborts the restore operation in progress and reverts already applied changes.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="116" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="116" /> <source>Continue restore</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="117" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="117" /> <source>Continue restore...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="124" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="124" /> <source>Continue the restore operation in progress</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="127" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="127" /> <source><b>Continue restore</b><p>This continues the restore operation in progress.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="136" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="136" /> <source>Delete shelved changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="137" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="137" /> <source>Delete shelved changes...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="144" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="144" /> <source><b>Delete shelved changes...</b><p>This opens a dialog to select the shelved changes to delete and deletes the selected ones.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="155" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="154" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="155" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="154" /> <source>Delete ALL shelved changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="162" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="162" /> <source><b>Delete ALL shelved changes</b><p>This deletes all shelved changes.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="231" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="202" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="231" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="202" /> <source>Shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="218" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="218" /> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Projenin yeniden okunması gerekiyor. Şimdi yapılsın mı?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="244" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="244" /> <source>Unshelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="251" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="251" /> <source>Abort Unshelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="258" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="258" /> <source>Continue Unshelve</source> <translation type="unfinished" /> </message> @@ -78831,41 +79060,10 @@ </message> </context> <context> - <name>Strip</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/strip.py" line="68" /> - <source>Stripping changesets from repository</source> - <translation type="unfinished" /> - </message> - </context> - <context> <name>StripProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="37" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="35" /> - <source>Strip changesets</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="43" /> - <source>Strip changesets from a repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="45" /> - <source><b>Strip changesets</b><p>This deletes a changeset and all its descendants from a repository. Each removed changeset will be stored in .hg/strip-backup as a bundle file.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="91" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="79" /> - <source>Strip</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="92" /> <source>The project should be reread. Do this now?</source> - <translation type="unfinished">Projenin yeniden okunması gerekiyor. Şimdi yapılsın mı?</translation> + <translation type="vanished">Projenin yeniden okunması gerekiyor. Şimdi yapılsın mı?</translation> </message> </context> <context> @@ -79970,12 +80168,12 @@ <context> <name>SvnDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="165" /> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="168" /> <source>Process Generation Error</source> <translation>İşlem Üretecinde Hata</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="166" /> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="169" /> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> @@ -90429,6 +90627,66 @@ </message> </context> <context> + <name>Uncommit</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/uncommit.py" line="64" /> + <source>Undo Local Commit</source> + <translation type="unfinished" /> + </message> + </context> + <context> + <name>UncommitProjectBrowserHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="145" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="82" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="72" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="62" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="52" /> + <source>Undo Local Commit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="96" /> + <source>Uncommit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="126" /> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished">Projenin yeniden okunması gerekiyor. Şimdi yapılsın mı?</translation> + </message> + </context> + <context> + <name>UncommitProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="107" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="38" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="36" /> + <source>Undo Local Commit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="44" /> + <source>Undo the effect of a local commit.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="46" /> + <source><b>Undo Local Commit</b><p>This undoes the effect of a local commit, returning the affected files to their uncommitted state.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="79" /> + <source>Uncommit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="95" /> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished">Projenin yeniden okunması gerekiyor. Şimdi yapılsın mı?</translation> + </message> + </context> + <context> <name>UnittestExecutor</name> <message> <location filename="../Testing/Interfaces/UnittestExecutor.py" line="52" /> @@ -91075,7 +91333,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7892" /> + <location filename="../UI/UserInterface.py" line="7893" /> <location filename="../UI/UserInterface.py" line="1955" /> <location filename="../UI/UserInterface.py" line="1948" /> <source>Load session</source> @@ -92403,8 +92661,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7600" /> - <location filename="../UI/UserInterface.py" line="7581" /> + <location filename="../UI/UserInterface.py" line="7601" /> + <location filename="../UI/UserInterface.py" line="7582" /> <location filename="../UI/UserInterface.py" line="3402" /> <source>Export Keyboard Shortcuts</source> <translation>Kılavye Kısa Yollarını Dışa Aktar</translation> @@ -92425,7 +92683,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7619" /> + <location filename="../UI/UserInterface.py" line="7620" /> <location filename="../UI/UserInterface.py" line="3421" /> <source>Import Keyboard Shortcuts</source> <translation>Klavye kısayollarını İçe Aktar</translation> @@ -93150,169 +93408,169 @@ <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7108" /> - <location filename="../UI/UserInterface.py" line="7046" /> - <location filename="../UI/UserInterface.py" line="7002" /> - <location filename="../UI/UserInterface.py" line="6928" /> - <location filename="../UI/UserInterface.py" line="6864" /> - <source>Documentation Missing</source> - <translation>Eksik Belgeleme</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="7109" /> <location filename="../UI/UserInterface.py" line="7047" /> <location filename="../UI/UserInterface.py" line="7003" /> <location filename="../UI/UserInterface.py" line="6929" /> <location filename="../UI/UserInterface.py" line="6865" /> + <source>Documentation Missing</source> + <translation>Eksik Belgeleme</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7110" /> + <location filename="../UI/UserInterface.py" line="7048" /> + <location filename="../UI/UserInterface.py" line="7004" /> + <location filename="../UI/UserInterface.py" line="6930" /> + <location filename="../UI/UserInterface.py" line="6866" /> <source><p>The documentation starting point "<b>{0}</b>" could not be found.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7090" /> - <location filename="../UI/UserInterface.py" line="6972" /> - <source>Documentation</source> - <translation>Belgeleme</translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="6973" /> - <source><p>The PyQt{0} documentation starting point has not been configured.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="7091" /> + <location filename="../UI/UserInterface.py" line="6973" /> + <source>Documentation</source> + <translation>Belgeleme</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="6974" /> + <source><p>The PyQt{0} documentation starting point has not been configured.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7092" /> <source><p>The PySide{0} documentation starting point has not been configured.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7270" /> - <location filename="../UI/UserInterface.py" line="7206" /> - <source>Start Web Browser</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../UI/UserInterface.py" line="7207" /> - <source>The eric web browser could not be started.</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="7271" /> + <location filename="../UI/UserInterface.py" line="7207" /> + <source>Start Web Browser</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7208" /> + <source>The eric web browser could not be started.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7272" /> <source><p>The eric web browser is not started.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7317" /> + <location filename="../UI/UserInterface.py" line="7318" /> <source>Open Browser</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7317" /> + <location filename="../UI/UserInterface.py" line="7318" /> <source>Could not start a web browser</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7621" /> - <location filename="../UI/UserInterface.py" line="7583" /> + <location filename="../UI/UserInterface.py" line="7622" /> + <location filename="../UI/UserInterface.py" line="7584" /> <source>Keyboard Shortcuts File (*.ekj)</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7601" /> + <location filename="../UI/UserInterface.py" line="7602" /> <source><p>The keyboard shortcuts file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7805" /> + <location filename="../UI/UserInterface.py" line="7806" /> <source>Load crash session...</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7808" /> + <location filename="../UI/UserInterface.py" line="7809" /> <source>Clean crash sessions...</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7845" /> - <source>Read Session</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="7846" /> + <source>Read Session</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7847" /> <source><p>The session file <b>{0}</b> could not be read.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7869" /> + <location filename="../UI/UserInterface.py" line="7870" /> <source>Save Session</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7894" /> - <location filename="../UI/UserInterface.py" line="7871" /> + <location filename="../UI/UserInterface.py" line="7895" /> + <location filename="../UI/UserInterface.py" line="7872" /> <source>eric Session Files (*.esj)</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7963" /> - <source>Found Crash Sessions</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="7964" /> + <source>Found Crash Sessions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7965" /> <source>These crash session files were found. Select the one to open. Select 'Cancel' to not open a crash session.</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="8037" /> - <source>Clean stale crash sessions</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="8038" /> + <source>Clean stale crash sessions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8039" /> <source>Do you really want to delete these stale crash session files?</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="8414" /> - <source>Drop Error</source> - <translation>Düşme hatası</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="8415" /> + <source>Drop Error</source> + <translation>Düşme hatası</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8416" /> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> bir dosya değil.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="8612" /> - <source>Upgrade available</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="8613" /> + <source>Upgrade available</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8614" /> <source><p>A newer version of the <b>eric-ide</b> package is available at <a href="{0}/eric-ide/">PyPI</a>.</p><p>Installed: {1}<br/>Available: <b>{2}</b></p><p>Shall <b>eric-ide</b> be upgraded?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="8661" /> - <source>First time usage</source> - <translation>İlk kullanım</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="8662" /> + <source>First time usage</source> + <translation>İlk kullanım</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8663" /> <source>eric has not been configured yet. The configuration dialog will be started.</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="8684" /> + <location filename="../UI/UserInterface.py" line="8685" /> <source>Select Workspace Directory</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="8852" /> - <source>Unsaved Data Detected</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="8853" /> + <source>Unsaved Data Detected</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8854" /> <source>Some editors contain unsaved data. Shall these be saved?</source> <translation type="unfinished" /> </message> @@ -100306,8 +100564,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>&Browsing History</source> - <translation type="unfinished">Gözatıcı Ge&çmişi</translation> + <source>Browsing History</source> + <translation type="unfinished" /> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100346,8 +100604,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>&Search History</source> - <translation type="unfinished">Arama Geçmi&şi</translation> + <source>Search History</source> + <translation type="unfinished" /> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100356,7 +100614,7 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>Download &History</source> + <source>Download History</source> <translation type="unfinished" /> </message> <message> @@ -100366,8 +100624,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>&Cookies</source> - <translation type="unfinished">&Çerezler</translation> + <source>Cookies</source> + <translation type="unfinished">Çerezler</translation> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100376,8 +100634,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>Cached &Web Pages</source> - <translation type="unfinished">&Wep sayfaları Önbelleği</translation> + <source>Cached Web Pages</source> + <translation type="unfinished" /> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100386,8 +100644,18 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>Website &Icons</source> - <translation type="unfinished">Websitesi &İconları</translation> + <source>Website Icons</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> + <source>Select to clear the website permissions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> + <source>Website Permissions</source> + <translation type="unfinished" /> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100396,8 +100664,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>Saved &Passwords</source> - <translation type="unfinished">Kaydedilmiş &Parolalar</translation> + <source>Saved Passwords</source> + <translation type="unfinished">Kaydedilmiş Parolalar</translation> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100406,7 +100674,7 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>&Zoom Settings</source> + <source>Zoom Settings</source> <translation type="unfinished" /> </message> <message> @@ -100414,6 +100682,30 @@ <source>SSL Certificate Error Exceptions</source> <translation type="unfinished" /> </message> + <message> + <source>&Browsing History</source> + <translation type="vanished">Gözatıcı Ge&çmişi</translation> + </message> + <message> + <source>&Search History</source> + <translation type="vanished">Arama Geçmi&şi</translation> + </message> + <message> + <source>&Cookies</source> + <translation type="vanished">&Çerezler</translation> + </message> + <message> + <source>Cached &Web Pages</source> + <translation type="vanished">&Wep sayfaları Önbelleği</translation> + </message> + <message> + <source>Website &Icons</source> + <translation type="vanished">Websitesi &İconları</translation> + </message> + <message> + <source>Saved &Passwords</source> + <translation type="vanished">Kaydedilmiş &Parolalar</translation> + </message> </context> <context> <name>WebBrowserJavaScriptConsole</name> @@ -100947,6 +101239,16 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/WebBrowserPage.ui" line="0" /> + <source>Select to store website permission settings in memory only.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserPage.ui" line="0" /> + <source>Do not persist website permissions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserPage.ui" line="0" /> <source><p>Select to allow reading from all canvas elements.</p> <p><b>Note:</b> Disable this option to prevent canvas fingerprinting.</p></source> <translation type="unfinished" /> @@ -101359,32 +101661,87 @@ <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="194" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="78" /> + <source><p>Allow <b>{0}</b> to access your location information?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="83" /> + <source><p>Allow <b>{0}</b> to access your microphone?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="89" /> + <source><p>Allow <b>{0}</b> to access your webcam?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="95" /> + <source><p>Allow <b>{0}</b> to access your microphone and webcam?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="100" /> + <source><p>Allow <b>{0}</b> to lock your mouse cursor?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="105" /> + <source><p>Allow <b>{0}</b> to capture video of your desktop?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="111" /> + <source><p>Allow <b>{0}</b> to capture audio and video of your desktop?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="118" /> + <source><p>Allow <b>{0}</b> to show notifications on your desktop?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="124" /> + <source><p>Allow <b>{0}</b> to read from and write to the clipboard?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="130" /> + <source><p>Allow <b>{0}</b> to access fonts stored on this machine?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="269" /> <source>Suspicuous URL detected</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="195" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="270" /> <source><p>The URL <b>{0}</b> was found in the Safe Browsing database.</p>{1}</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="541" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="396" /> + <source>Permission Request</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="636" /> <source>Register Protocol Handler</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="542" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="637" /> <source><p>Allow the Web Site <b>{0}</b> to handle all <b>{1}</b> links?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="631" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="726" /> <source>SSL Info</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="632" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="727" /> <source>This site does not contain SSL information.</source> <translation type="unfinished" /> </message> @@ -103977,15 +104334,15 @@ <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5231" /> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5221" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5248" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5238" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2220" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2218" /> <source>IP Address Report</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5245" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5262" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2232" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2230" /> <source>Domain Report</source> @@ -104012,8 +104369,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5651" /> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5632" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5675" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5656" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2270" /> <source>Export Keyboard Shortcuts</source> <translation type="unfinished">Kılavye Kısa Yollarını Dışa Aktar</translation> @@ -104034,7 +104391,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5671" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5695" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2289" /> <source>Import Keyboard Shortcuts</source> <translation type="unfinished">Klavye kısayollarını İçe Aktar</translation> @@ -104284,99 +104641,99 @@ <translation type="unfinished">Yardım Motoru</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4768" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4785" /> <source>System</source> <translation type="unfinished">Sistem</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4772" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4789" /> <source>ISO</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4775" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4792" /> <source>Unicode</source> <translation type="unfinished">Evrensel kod</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4778" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4795" /> <source>Windows</source> <translation type="unfinished">Windows</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4781" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4798" /> <source>IBM</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4784" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4801" /> <source>Apple</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4787" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4804" /> <source>Other</source> <translation type="unfinished">Diğer</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4814" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4831" /> <source>Menu Bar</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4819" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4836" /> <source>Bookmarks</source> <translation type="unfinished">Yerimleri</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4824" /> - <source>Status Bar</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4839" /> - <source>&Show all</source> - <translation type="unfinished">Hepsini Gö&ster</translation> - </message> - <message> <location filename="../WebBrowser/WebBrowserWindow.py" line="4841" /> + <source>Status Bar</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4856" /> + <source>&Show all</source> + <translation type="unfinished">Hepsini Gö&ster</translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4858" /> <source>&Hide all</source> <translation type="unfinished">&Hepsini gizle</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5187" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5204" /> <source>VirusTotal Scan</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5188" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5205" /> <source><p>The VirusTotal scan could not be scheduled.<p> <p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5222" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5239" /> <source>Enter a valid IPv4 address in dotted quad notation:</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5232" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5249" /> <source>The given IP address is not in dotted quad notation.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5246" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5263" /> <source>Enter a valid domain name:</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5673" /> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5634" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5697" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5658" /> <source>Keyboard Shortcuts File (*.ekj)</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5652" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5676" /> <source><p>The keyboard shortcuts file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished" /> </message> @@ -105476,32 +105833,32 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1383" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1389" /> <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>Esas #{0}</b></td><td></td></tr> <tr><td><b>Değişiklik seti</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1955" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1391" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1964" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397" /> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Etiketler</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1961" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1970" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1403" /> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1968" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1404" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1977" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1410" /> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branşlar</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1410" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1416" /> <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> @@ -105510,7 +105867,7 @@ <tr><td><b>Teslim zamnanı</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1429" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1435" /> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -105521,35 +105878,35 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1929" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1938" /> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1936" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945" /> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1943" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1952" /> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>İp ucu</b></td><td></td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1948" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1957" /> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>DEğişiklik seti</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1975" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1984" /> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Esas</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1981" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990" /> <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>
--- a/src/eric7/i18n/eric7_zh_CN.ts Sat Nov 30 11:09:02 2024 +0100 +++ b/src/eric7/i18n/eric7_zh_CN.ts Tue Jan 14 17:29:56 2025 +0100 @@ -7728,18 +7728,18 @@ <translation>图形</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="896" /> + <location filename="../Preferences/ConfigurationDialog.py" line="903" /> <location filename="../Preferences/ConfigurationDialog.py" line="228" /> <source>Hex Editor</source> <translation type="unfinished">十六进制编辑器</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1129" /> - <location filename="../Preferences/ConfigurationDialog.py" line="1090" /> - <location filename="../Preferences/ConfigurationDialog.py" line="982" /> - <location filename="../Preferences/ConfigurationDialog.py" line="944" /> - <location filename="../Preferences/ConfigurationDialog.py" line="913" /> - <location filename="../Preferences/ConfigurationDialog.py" line="882" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1136" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1097" /> + <location filename="../Preferences/ConfigurationDialog.py" line="989" /> + <location filename="../Preferences/ConfigurationDialog.py" line="951" /> + <location filename="../Preferences/ConfigurationDialog.py" line="920" /> + <location filename="../Preferences/ConfigurationDialog.py" line="889" /> <location filename="../Preferences/ConfigurationDialog.py" line="785" /> <location filename="../Preferences/ConfigurationDialog.py" line="670" /> <location filename="../Preferences/ConfigurationDialog.py" line="235" /> @@ -7757,7 +7757,7 @@ <translation>日志浏览器</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1104" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1111" /> <location filename="../Preferences/ConfigurationDialog.py" line="250" /> <source>MicroPython</source> <translation type="unfinished" /> @@ -7774,8 +7774,9 @@ <translation>网络</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1111" /> - <location filename="../Preferences/ConfigurationDialog.py" line="958" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1118" /> + <location filename="../Preferences/ConfigurationDialog.py" line="965" /> + <location filename="../Preferences/ConfigurationDialog.py" line="806" /> <location filename="../Preferences/ConfigurationDialog.py" line="271" /> <source>Network Proxy</source> <translation type="unfinished">网络代理</translation> @@ -7786,13 +7787,13 @@ <translation>通知</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="927" /> + <location filename="../Preferences/ConfigurationDialog.py" line="934" /> <location filename="../Preferences/ConfigurationDialog.py" line="285" /> <source>PDF Viewer</source> <translation>PDF查看器</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="965" /> + <location filename="../Preferences/ConfigurationDialog.py" line="972" /> <location filename="../Preferences/ConfigurationDialog.py" line="292" /> <source>Python Package Management</source> <translation type="unfinished">python包管理</translation> @@ -7803,7 +7804,7 @@ <translation>插件管理器</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="806" /> + <location filename="../Preferences/ConfigurationDialog.py" line="813" /> <location filename="../Preferences/ConfigurationDialog.py" line="684" /> <location filename="../Preferences/ConfigurationDialog.py" line="306" /> <source>Printer</source> @@ -7820,13 +7821,13 @@ <translation>Qt</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="813" /> + <location filename="../Preferences/ConfigurationDialog.py" line="820" /> <location filename="../Preferences/ConfigurationDialog.py" line="321" /> <source>Security</source> <translation>安全</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="996" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1003" /> <location filename="../Preferences/ConfigurationDialog.py" line="328" /> <source>Shell</source> <translation>命令行</translation> @@ -7842,7 +7843,7 @@ <translation>模板</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="865" /> + <location filename="../Preferences/ConfigurationDialog.py" line="872" /> <location filename="../Preferences/ConfigurationDialog.py" line="343" /> <source>Tray Starter</source> <translation>托盘启动器</translation> @@ -7858,7 +7859,7 @@ <translation>调试器</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1003" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1010" /> <location filename="../Preferences/ConfigurationDialog.py" line="698" /> <location filename="../Preferences/ConfigurationDialog.py" line="399" /> <location filename="../Preferences/ConfigurationDialog.py" line="364" /> @@ -7893,14 +7894,14 @@ <translation>文件处理</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1010" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1017" /> <location filename="../Preferences/ConfigurationDialog.py" line="712" /> <location filename="../Preferences/ConfigurationDialog.py" line="413" /> <source>Searching</source> <translation>查找</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="848" /> + <location filename="../Preferences/ConfigurationDialog.py" line="855" /> <location filename="../Preferences/ConfigurationDialog.py" line="719" /> <location filename="../Preferences/ConfigurationDialog.py" line="648" /> <location filename="../Preferences/ConfigurationDialog.py" line="420" /> @@ -7908,7 +7909,7 @@ <translation>拼写检查</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1017" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1024" /> <location filename="../Preferences/ConfigurationDialog.py" line="726" /> <location filename="../Preferences/ConfigurationDialog.py" line="427" /> <source>Style</source> @@ -7931,14 +7932,14 @@ <translation>输出器</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1024" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1031" /> <location filename="../Preferences/ConfigurationDialog.py" line="455" /> <source>Autocompletion</source> <translation>自动完成</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1045" /> - <location filename="../Preferences/ConfigurationDialog.py" line="1031" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1052" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1038" /> <location filename="../Preferences/ConfigurationDialog.py" line="483" /> <location filename="../Preferences/ConfigurationDialog.py" line="462" /> <source>QScintilla</source> @@ -7952,13 +7953,13 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1038" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1045" /> <location filename="../Preferences/ConfigurationDialog.py" line="476" /> <source>Calltips</source> <translation>调用提示</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1052" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1059" /> <location filename="../Preferences/ConfigurationDialog.py" line="740" /> <location filename="../Preferences/ConfigurationDialog.py" line="497" /> <source>Highlighters</source> @@ -7971,21 +7972,21 @@ <translation>文件类型关联</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1059" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1066" /> <location filename="../Preferences/ConfigurationDialog.py" line="754" /> <location filename="../Preferences/ConfigurationDialog.py" line="511" /> <source>Styles</source> <translation>风格</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1066" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1073" /> <location filename="../Preferences/ConfigurationDialog.py" line="761" /> <location filename="../Preferences/ConfigurationDialog.py" line="518" /> <source>Keywords</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1073" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1080" /> <location filename="../Preferences/ConfigurationDialog.py" line="768" /> <location filename="../Preferences/ConfigurationDialog.py" line="525" /> <source>Properties</source> @@ -8002,7 +8003,7 @@ <translation>帮助</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="820" /> + <location filename="../Preferences/ConfigurationDialog.py" line="827" /> <location filename="../Preferences/ConfigurationDialog.py" line="553" /> <source>Help Documentation</source> <translation>帮助文档</translation> @@ -8029,12 +8030,12 @@ <translation>多重项目</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1136" /> - <location filename="../Preferences/ConfigurationDialog.py" line="1097" /> - <location filename="../Preferences/ConfigurationDialog.py" line="989" /> - <location filename="../Preferences/ConfigurationDialog.py" line="951" /> - <location filename="../Preferences/ConfigurationDialog.py" line="920" /> - <location filename="../Preferences/ConfigurationDialog.py" line="889" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1143" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1104" /> + <location filename="../Preferences/ConfigurationDialog.py" line="996" /> + <location filename="../Preferences/ConfigurationDialog.py" line="958" /> + <location filename="../Preferences/ConfigurationDialog.py" line="927" /> + <location filename="../Preferences/ConfigurationDialog.py" line="896" /> <location filename="../Preferences/ConfigurationDialog.py" line="792" /> <location filename="../Preferences/ConfigurationDialog.py" line="677" /> <location filename="../Preferences/ConfigurationDialog.py" line="602" /> @@ -8053,46 +8054,46 @@ <translation type="unfinished">Web浏览器</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="827" /> + <location filename="../Preferences/ConfigurationDialog.py" line="834" /> <location filename="../Preferences/ConfigurationDialog.py" line="627" /> <source>Appearance</source> <translation>外观</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="834" /> + <location filename="../Preferences/ConfigurationDialog.py" line="841" /> <location filename="../Preferences/ConfigurationDialog.py" line="634" /> <source>eric Web Browser</source> <translation type="unfinished">eric 网页浏览器</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="841" /> + <location filename="../Preferences/ConfigurationDialog.py" line="848" /> <location filename="../Preferences/ConfigurationDialog.py" line="641" /> <source>VirusTotal Interface</source> <translation>VirusTotal 界面</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1228" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1235" /> <source>Enter search text...</source> <translation>输入搜索内容…</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1303" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1310" /> <source>Preferences</source> <translation>首选项</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1309" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1316" /> <source>Please select an entry of the list to display the configuration page.</source> <translation>请在左边选择一个列表项以显示配置页面。</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1392" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1399" /> <source>Configuration Page Error</source> <translation>配置页面错误</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1393" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1400" /> <source><p>The configuration page <b>{0}</b> could not be loaded.</p></source> <translation><p>配置页面 <b>{0}</b> 无法载入。</p></translation> </message> @@ -10664,12 +10665,12 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="1691" /> + <location filename="../Debugger/DebuggerInterfacePython.py" line="1692" /> <source>Debug Protocol Error</source> <translation type="unfinished" /> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="1692" /> + <location filename="../Debugger/DebuggerInterfacePython.py" line="1693" /> <source><p>The response received from the debugger backend could not be decoded. Please report this issue with the received data to the eric bugs email address.</p><p>Error: {0}</p><p>Data:<br/>{1}</p></source> <translation type="unfinished" /> </message> @@ -22676,64 +22677,147 @@ </message> </context> <context> + <name>Fastexport</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="183" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="174" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="168" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="159" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="133" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="113" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="57" /> + <source>Mercurial Fastexport</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="58" /> + <source><p>The output file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="107" /> + <source>Cancel</source> + <translation type="unfinished">取消</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="110" /> + <source>%v/%m Changesets</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="116" /> + <source>Exporting repository (time remaining: {0}) ...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="134" /> + <source><p>The repository fastexport process sent an error message.</p><p>{0}</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="160" /> + <source><p>The repository fastexport process finished successfully.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="169" /> + <source><p>The repository fastexport process was cancelled.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="175" /> + <source><p>The repository fastexport process finished with exit code <b>{0}</b>.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/fastexport.py" line="184" /> + <source><p>The repository fastexport process crashed.</p></source> + <translation type="unfinished" /> + </message> + </context> + <context> + <name>FastexportProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="37" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="35" /> + <source>Export to git</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="44" /> + <source>Export the repository as git fast-import stream.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="47" /> + <source><b>Export to git</b><p>This exports the repository as a git fast-import stream.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/ProjectHelper.py" line="79" /> + <source>Fastexport</source> + <translation type="unfinished" /> + </message> + </context> + <context> <name>FeaturePermissionBar</name> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="48" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="50" /> <source>{0} wants to use your position.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="51" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="53" /> <source>{0} wants to use your microphone.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="54" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="56" /> <source>{0} wants to use your camera.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="57" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="59" /> <source>{0} wants to use your microphone and camera.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="60" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="62" /> <source>{0} wants to lock your mouse.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="61" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="63" /> <source>{0} wants to capture video of your screen.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="64" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="66" /> <source>{0} wants to capture audio and video of your screen.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="67" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="69" /> <source>{0} wants to use desktop notifications.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="92" /> - <source>Remember</source> - <translation>记住</translation> - </message> - <message> <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="94" /> + <source>Remember</source> + <translation>记住</translation> + </message> + <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="96" /> <source>Allow</source> <translation>允许</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="95" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="97" /> <source>Deny</source> <translation>拒绝</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="120" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="122" /> <source>{0} wants to use an unknown feature.</source> <translation type="unfinished" /> </message> @@ -22741,80 +22825,106 @@ <context> <name>FeaturePermissionsDialog</name> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="161" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="143" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="127" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="109" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="93" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="79" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="65" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="49" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="208" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="190" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="170" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="152" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="136" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="118" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="102" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="88" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="74" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="58" /> <source>Host</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="162" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="144" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="128" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="110" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="94" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="80" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="66" /> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="50" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="209" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="191" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="171" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="153" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="137" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="119" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="103" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="89" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="75" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="59" /> <source>Permission</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="54" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="63" /> <source>Notifications</source> <translation>通知</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="68" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="77" /> <source>Geolocation</source> <translation>地理位置</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="82" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="91" /> <source>Microphone</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="96" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="105" /> <source>Camera</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="114" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="123" /> <source>Microphone && Camera</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="130" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="139" /> <source>Mouse Lock</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="148" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="157" /> <source>Desktop Video</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="166" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="175" /> <source>Desktop Audio && Video</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="181" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="195" /> + <source>Clipboard</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="213" /> + <source>Local Fonts</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="296" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="253" /> <source>Allow</source> <translation>允许</translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="182" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="297" /> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="254" /> <source>Deny</source> <translation>拒绝</translation> </message> <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="255" /> + <source>Always Ask</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="256" /> + <source>Invalid</source> + <translation type="unfinished" /> + </message> + <message> <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.ui" line="0" /> <source>HTML5 Feature Permissions</source> <translation type="unfinished" /> @@ -24685,74 +24795,74 @@ <translation type="unfinished" /> </message> <message> - <location filename="../UI/FindFileWidget.py" line="750" /> + <location filename="../UI/FindFileWidget.py" line="749" /> <source>Invalid search expression</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/FindFileWidget.py" line="751" /> + <location filename="../UI/FindFileWidget.py" line="750" /> <source><p>The search expression is not valid.</p><p>Error: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/FindFileWidget.py" line="878" /> + <location filename="../UI/FindFileWidget.py" line="877" /> <source>{0} / {1}</source> <comment>occurrences / files</comment> <translation type="unfinished" /> </message> <message numerus="yes"> - <location filename="../UI/FindFileWidget.py" line="881" /> + <location filename="../UI/FindFileWidget.py" line="880" /> <source>%n occurrence(s)</source> <translation type="unfinished"> <numerusform /> </translation> </message> <message numerus="yes"> - <location filename="../UI/FindFileWidget.py" line="882" /> + <location filename="../UI/FindFileWidget.py" line="881" /> <source>%n file(s)</source> <translation type="unfinished"> <numerusform /> </translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1081" /> - <location filename="../UI/FindFileWidget.py" line="1056" /> - <location filename="../UI/FindFileWidget.py" line="1042" /> + <location filename="../UI/FindFileWidget.py" line="1080" /> + <location filename="../UI/FindFileWidget.py" line="1055" /> + <location filename="../UI/FindFileWidget.py" line="1041" /> <source>Replace in Files</source> <translation type="unfinished">在文件中替换</translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1043" /> + <location filename="../UI/FindFileWidget.py" line="1042" /> <source><p>Could not read the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1057" /> + <location filename="../UI/FindFileWidget.py" line="1056" /> <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 type="unfinished" /> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1082" /> + <location filename="../UI/FindFileWidget.py" line="1081" /> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1111" /> + <location filename="../UI/FindFileWidget.py" line="1110" /> <source>Open</source> <translation type="unfinished">打开</translation> </message> <message> - <location filename="../UI/FindFileWidget.py" line="1113" /> + <location filename="../UI/FindFileWidget.py" line="1112" /> <source>Copy Path to Clipboard</source> <translation type="unfinished">将路径复制到剪贴板</translation> </message> <message> + <location filename="../UI/FindFileWidget.py" line="1116" /> + <source>Select All</source> + <translation type="unfinished">全选</translation> + </message> + <message> <location filename="../UI/FindFileWidget.py" line="1117" /> - <source>Select All</source> - <translation type="unfinished">全选</translation> - </message> - <message> - <location filename="../UI/FindFileWidget.py" line="1118" /> <source>Deselect All</source> <translation type="unfinished" /> </message> @@ -26930,37 +27040,37 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="91" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="94" /> <source>Additional Output</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="110" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="113" /> <source>Process canceled.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="124" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="127" /> <source>Process finished successfully.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="126" /> - <source>Process crashed.</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="129" /> + <source>Process crashed.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="132" /> <source>Process finished with exit code {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="195" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="198" /> <source>Process Generation Error</source> <translation type="unfinished">进程生成错误</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="196" /> + <location filename="../Plugins/VcsPlugins/vcsGit/GitDialog.py" line="199" /> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> @@ -35324,456 +35434,456 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="303" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="309" /> <source>Create project repository</source> <translation>创建项目仓库</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="304" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="310" /> <source>The project repository could not be created.</source> <translation>无法创建项目仓库。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="338" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="344" /> <source>Creating Mercurial repository</source> <translation>创建 Mercurial 仓库</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="359" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="365" /> <source>Initial commit to Mercurial repository</source> <translation>向 Mercurial 仓库进行初始提交</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="405" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="411" /> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="516" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="522" /> <source>Commit Changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="517" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="523" /> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="580" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="586" /> <source>Committing changes to Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="679" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="685" /> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="719" /> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="774" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="780" /> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="829" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="835" /> <source>Renaming {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="964" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="970" /> <source>Tagging in the Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1011" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1000" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1017" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1006" /> <source>Revert changes</source> <translation type="unfinished">还原改变</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1001" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1007" /> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1012" /> - <source>Do you really want to revert all changes of the project?</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1018" /> + <source>Do you really want to revert all changes of the project?</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1024" /> <source>Reverting changes</source> <translation type="unfinished">还原改变</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1064" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1070" /> <source>Merging</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1095" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1109" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101" /> <source>Re-Merge</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1102" /> <source>Do you really want to re-merge these files or directories?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1104" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1110" /> <source>Do you really want to re-merge the project?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1114" /> <source>Re-Merging</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1131" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1137" /> <source>Current branch tip</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1314" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1320" /> <source>Mercurial command</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1492" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1498" /> <source>Copying {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1758" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1746" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1764" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1752" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743" /> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1759" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1765" /> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>文件 <b>{0}</b> 无法读取。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2457" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2446" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2436" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1835" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2455" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844" /> <source>Apply changegroups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1838" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1847" /> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1884" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1893" /> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2027" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2036" /> <source>Marking as 'unresolved'</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2029" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038" /> <source>Marking as 'resolved'</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2051" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060" /> <source>Aborting uncommitted merge</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2084" /> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086" /> - <source>Created new branch <{0}>.</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2095" /> + <source>Created new branch <{0}>.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2104" /> <source>Showing current branch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2184" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193" /> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2200" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209" /> <source>Showing the combined configuration settings</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2215" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2224" /> <source>Showing aliases for remote repositories</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2230" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239" /> <source>Recovering from interrupted transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254" /> <source>Identifying project directory</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2291" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2300" /> <source>Create .hgignore file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2292" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301" /> <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="2395" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2369" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2351" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2404" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2378" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2360" /> <source>Create changegroup</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2353" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362" /> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2370" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2379" /> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2409" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2418" /> <source>Preview changegroup</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2438" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2411" /> - <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2447" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2420" /> + <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2456" /> <source>Shall the working directory be updated?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2479" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2488" /> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2501" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2510" /> <source>Mercurial Bisect ({0})</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2527" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2536" /> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2576" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2557" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2585" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2566" /> <source>Backing out changeset</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2558" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2567" /> <source>No revision given. Aborting...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2587" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2602" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2596" /> <source>Rollback last transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2588" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2597" /> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2657" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2666" /> <source>Import Patch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2707" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2716" /> <source>Export Patches</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2749" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2758" /> <source>Change Phase</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2804" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813" /> <source>Copy Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2843" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2852" /> <source>Copy Changesets (Continue)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2853" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2862" /> <source>Copy Changesets (Stop)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2863" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2872" /> <source>Copy Changesets (Abort)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2887" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2896" /> <source>Create Unversioned Archive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2902" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2911" /> <source>Delete All Backups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2903" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2912" /> <source><p>Do you really want to delete all backup bundles stored in the backup area?<br/><b>{0}</b></p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2994" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2974" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2963" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2983" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2972" /> <source>Add Sub-repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3033" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2964" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3042" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2973" /> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2975" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2984" /> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3051" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3060" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3004" /> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3050" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3032" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3018" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3059" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3027" /> <source>Remove Sub-repositories</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3019" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3028" /> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3296" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3138" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3147" /> <source>Mercurial Command Server</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3139" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3148" /> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3297" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3321" /> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3420" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3444" /> <source>Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3437" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3461" /> <source>Delete Bookmark</source> <translation type="unfinished">删除书签</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3438" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3462" /> <source>Select the bookmark to be deleted:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3449" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3473" /> <source>Delete Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3476" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3500" /> <source>Rename Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3518" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3542" /> <source>Move Mercurial Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3600" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3624" /> <source>Pull Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3601" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3625" /> <source>Select the bookmark to be pulled:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3613" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3637" /> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3641" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3665" /> <source>Push Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3642" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3666" /> <source>Select the bookmark to be push:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3657" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3681" /> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished" /> </message> @@ -36616,42 +36726,42 @@ <context> <name>HgClient</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="98" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="100" /> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="147" /> - <source>Did not receive the 'hello' message.</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="149" /> + <source>Did not receive the 'hello' message.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="151" /> <source>Received data on unexpected channel.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="154" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="156" /> <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="159" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="161" /> <source>'capabilities' message did not contain any capability.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="168" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="170" /> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="173" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="175" /> <source>'encoding' message did not contain any encoding.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="385" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="387" /> <source>For message see output dialog.</source> <translation type="unfinished" /> </message> @@ -37014,6 +37124,11 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="0" /> + <source>%v/%m</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="0" /> <source>Errors</source> <translation type="unfinished">错误</translation> </message> @@ -37057,6 +37172,11 @@ <source>Alt+P</source> <translation type="unfinished">Alt+P</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="211" /> + <source>Time remaining: {0}</source> + <translation type="unfinished" /> + </message> </context> <context> <name>HgDiffDialog</name> @@ -37236,6 +37356,69 @@ </message> </context> <context> + <name>HgFastexportConfigDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>fastexport Configuration</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the path of the file for the exported marks.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the path of the output file.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Revisions:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the path of the file containing already exported marks.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Author Map:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Import Marks:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Export Marks:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Output File:</source> + <translation type="unfinished">输出文件：</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the revisions, tags or branches to be exported (separated by comma).</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.ui" line="0" /> + <source>Enter the path of the author map file.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FastexportExtension/HgFastexportConfigDialog.py" line="42" /> + <source>Text Files (*.txt);;All Files (*)</source> + <translation type="unfinished">文本文件 (*.txt);;所有文件 (*)</translation> + </message> + </context> + <context> <name>HgGpgSignDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="0" /> @@ -38047,7 +38230,7 @@ <translation type="unfinished">视图</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3049" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3063" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="298" /> <source>Select Branches</source> <translation type="unfinished" /> @@ -38088,7 +38271,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2218" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2227" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="343" /> <source>Copy Changesets</source> <translation type="unfinished" /> @@ -38145,8 +38328,8 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2312" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2295" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2321" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2304" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="387" /> <source>Switch</source> <translation type="unfinished">转换</translation> @@ -38177,263 +38360,270 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2430" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1622" /> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="415" /> - <source>Pull Changes</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="418" /> - <source>Pull changes from a remote repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="420" /> + <source>Pull Selected Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="419" /> + <source>Pull selected changes from a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="423" /> + <source>Pull All Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="427" /> + <source>Pull all changes from a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="430" /> <source>Pull Large Files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="422" /> - <source>Pull large files for selected revisions</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="428" /> - <source>Push Selected Changes</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="432" /> - <source>Push changes of the selected changeset and its ancestors to a remote repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="439" /> - <source>Push All Changes</source> + <source>Pull large files for selected revisions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="438" /> + <source>Push Selected Changes</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="442" /> - <source>Push all changes to a remote repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="448" /> - <source>Create Changegroup</source> + <source>Push changes of the selected changeset and its ancestors to a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="449" /> + <source>Push All Changes</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="452" /> + <source>Push all changes to a remote repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="458" /> + <source>Create Changegroup</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="462" /> <source>Create a changegroup file containing the selected changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="455" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="465" /> <source><b>Create Changegroup</b> <p>This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2569" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="468" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2583" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="478" /> <source>Apply Changegroup</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="472" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="482" /> <source>Apply the currently viewed changegroup file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="479" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="489" /> <source>Sign Revisions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="483" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="493" /> <source>Add a signature for the selected revisions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="487" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="497" /> <source>Verify Signatures</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="491" /> - <source>Verify all signatures there may be for the selected revision</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2476" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="498" /> - <source>Strip Changesets</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="501" /> + <source>Verify all signatures there may be for the selected revision</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="508" /> + <source>Strip Changesets</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="511" /> <source>Strip changesets from a repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="506" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="516" /> <source>Select All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="509" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="519" /> <source>Deselect All Entries</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="958" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="934" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="911" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="885" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="968" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="944" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="921" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="895" /> <source>Mercurial Error</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1266" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1276" /> <source>{0} (large file)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1532" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1542" /> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1543" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1553" /> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1701" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1620" /> - <source>Pull Selected Changes</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2570" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2477" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2431" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2313" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2219" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2584" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2491" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2445" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2322" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2228" /> <source>The project should be reread. Do this now?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2296" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2305" /> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2341" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2350" /> <source>Define Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2342" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2351" /> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2371" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2380" /> <source>Move Bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2372" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2381" /> <source>Select the bookmark to be moved to changeset '{0}':</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2444" /> + <source>Pull Changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2727" /> <source>Find Commit</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2714" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2728" /> <source>'{0}' was not found.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2774" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2788" /> <source>Generating differences ...</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="0" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2775" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2789" /> <source>Differences</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2794" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2808" /> <source>No differences available. Get some more log entries.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2796" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2810" /> <source>No differences available.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2807" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2821" /> <source>Differences to Parent {0}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2823" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2837" /> <source>Diff to Parent {0}{1}</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2846" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2860" /> <source>There is no difference.</source> <translation type="unfinished">没有差异。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2999" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2983" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2965" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3013" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2997" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2979" /> <source>Save Diff</source> <translation type="unfinished">保存差异</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2967" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2981" /> <source>Patch Files (*.diff)</source> <translation type="unfinished">补丁文件 (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2984" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2998" /> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"><p>补丁文件 <b>{0}</b> 已经存在。是否覆盖？</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3000" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3014" /> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation type="unfinished"><p>补丁文件 <b>{0}</b> 无法保存。<br />原因：{1}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3031" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3045" /> <source>closed</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3032" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3046" /> <source>inactive</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3041" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3055" /> <source>{0} ({1})</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3050" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="3064" /> <source>Select the branches to be shown (none for 'All'):</source> <translation type="unfinished" /> </message> @@ -38947,208 +39137,213 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="282" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="309" /> + <source>Other Functions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="335" /> <source>Extensions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="718" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="604" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="556" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="451" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="308" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="774" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="659" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="611" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="505" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="361" /> <source>Version Control</source> <translation>版本控制</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="734" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="620" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="467" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="324" /> - <source>Commit changes to repository...</source> - <translation>将更改提交到仓库中…</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="742" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="628" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="475" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="332" /> - <source>Add to repository</source> - <translation>添加到仓库</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="748" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="481" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="338" /> - <source>Remove from repository (and disk)</source> - <translation>从仓库（和磁盘）中移除</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1012" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="999" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="487" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="344" /> - <source>Remove from repository only</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="639" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="349" /> - <source>Copy</source> - <translation type="unfinished">复制</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="641" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="351" /> - <source>Move</source> - <translation type="unfinished">移动</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="646" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="356" /> - <source>Show log browser</source> - <translation>显示日志浏览器</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="755" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="653" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="494" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="363" /> - <source>Show status</source> - <translation>显示状态</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="762" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="660" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="501" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="370" /> - <source>Show differences</source> - <translation type="unfinished">显示差异</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="376" /> - <source>Show differences side-by-side</source> - <translation type="unfinished">并排显示差异</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="768" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="666" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="507" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="382" /> - <source>Show differences (extended)</source> - <translation type="unfinished">显示差异（扩展）</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="388" /> - <source>Show differences side-by-side (extended)</source> - <translation type="unfinished">并排显示差异（扩展）</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="394" /> - <source>Show annotated file</source> - <translation>显示有注释的文件</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="398" /> - <source>Show annotated file with skip list</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="402" /> - <source>Create skip list file</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="775" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="673" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="514" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="408" /> - <source>Revert changes</source> - <translation type="unfinished">还原改变</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="779" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="677" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="518" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="412" /> - <source>Conflicts resolved</source> - <translation type="unfinished">冲突已解决</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="781" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="679" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="520" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="414" /> - <source>Conflicts unresolved</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="783" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="681" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="522" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="416" /> - <source>Re-Merge</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="787" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="685" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="571" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="526" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="420" /> - <source>Select all local file entries</source> - <translation type="unfinished">选择所有本地文件条目</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="790" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="688" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="574" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="529" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="423" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="675" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="521" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="377" /> + <source>Commit changes to repository...</source> + <translation>将更改提交到仓库中…</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="799" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="684" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="530" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="386" /> + <source>Add to repository</source> + <translation>添加到仓库</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="805" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="690" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="536" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="392" /> + <source>Remove from repository (and disk)</source> + <translation>从仓库（和磁盘）中移除</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1069" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1056" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="542" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="398" /> + <source>Remove from repository only</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="695" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="403" /> + <source>Copy</source> + <translation type="unfinished">复制</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="697" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="405" /> + <source>Move</source> + <translation type="unfinished">移动</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="702" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="410" /> + <source>Show log browser</source> + <translation>显示日志浏览器</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="812" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="709" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="549" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="417" /> + <source>Show status</source> + <translation>显示状态</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="819" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="716" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="556" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="424" /> + <source>Show differences</source> + <translation type="unfinished">显示差异</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="430" /> + <source>Show differences side-by-side</source> + <translation type="unfinished">并排显示差异</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="825" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="722" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="562" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="436" /> + <source>Show differences (extended)</source> + <translation type="unfinished">显示差异（扩展）</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="442" /> + <source>Show differences side-by-side (extended)</source> + <translation type="unfinished">并排显示差异（扩展）</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="448" /> + <source>Show annotated file</source> + <translation>显示有注释的文件</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="452" /> + <source>Show annotated file with skip list</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="456" /> + <source>Create skip list file</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="832" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="729" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="569" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="462" /> + <source>Revert changes</source> + <translation type="unfinished">还原改变</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="836" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="733" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="573" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="466" /> + <source>Conflicts resolved</source> + <translation type="unfinished">冲突已解决</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="838" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="735" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="575" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="468" /> + <source>Conflicts unresolved</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="840" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="737" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="577" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="470" /> + <source>Re-Merge</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="844" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="741" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="581" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="474" /> + <source>Select all local file entries</source> + <translation type="unfinished">选择所有本地文件条目</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="847" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="744" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="629" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="584" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="477" /> <source>Select all versioned file entries</source> <translation type="unfinished">选择所有版本化的文件条目</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="793" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="691" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="577" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="532" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="426" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="850" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="747" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="632" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="587" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="480" /> <source>Select all local directory entries</source> <translation type="unfinished">选择所有本地文件夹条目</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="797" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="695" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="581" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="536" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="430" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="854" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="751" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="636" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="591" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="484" /> <source>Select all versioned directory entries</source> <translation type="unfinished">选择所有版本化的文件夹条目</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="801" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="699" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="585" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="540" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="434" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="858" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="755" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="640" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="595" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="488" /> <source>Configure...</source> <translation>配置…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="916" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="973" /> <source>Create {0} file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="917" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="974" /> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished"><p>文件 <b>{0}</b> 已经存在。是否覆盖？</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1013" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1000" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1070" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="1057" /> <source>Do you really want to remove these files from the repository?</source> <translation type="unfinished" /> </message> @@ -39156,1513 +39351,1518 @@ <context> <name>HgProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="126" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="135" /> <source>New from repository</source> <translation>从仓库新建</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="128" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="137" /> <source>&New from repository...</source> <translation>从仓库新建(&N)…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="135" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="144" /> <source>Create (clone) a new project from a Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="138" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="147" /> <source><b>New from repository</b><p>This creates (clones) a new local project from a Mercurial repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="150" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="148" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="159" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="157" /> <source>Show incoming log</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="156" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="165" /> <source>Show the log of incoming changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="158" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="167" /> <source><b>Show incoming log</b><p>This shows the log of changes coming into the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="170" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="168" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="179" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="177" /> <source>Pull changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="176" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="185" /> <source>Pull changes from a remote repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="178" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="187" /> <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="188" /> - <source>Update from repository</source> - <translation>从仓库更新</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="190" /> - <source>&Update from repository</source> - <translation>从仓库更新(&U)</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="197" /> + <source>Update from repository</source> + <translation>从仓库更新</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="199" /> + <source>&Update from repository</source> + <translation>从仓库更新(&U)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="206" /> <source>Update the local project from the Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="200" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="209" /> <source><b>Update from repository</b><p>This updates the local project from the Mercurial repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="210" /> - <source>Commit changes to repository</source> - <translation>将更改提交到仓库中</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="212" /> - <source>&Commit changes to repository...</source> - <translation>将更改提交到仓库中(&C)…</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="219" /> + <source>Commit changes to repository</source> + <translation>将更改提交到仓库中</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="221" /> + <source>&Commit changes to repository...</source> + <translation>将更改提交到仓库中(&C)…</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="228" /> <source>Commit changes to the local project to the Mercurial repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="231" /> <source><b>Commit changes to repository</b><p>This commits changes to the local project to the Mercurial repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="234" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="232" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="243" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="241" /> <source>Show outgoing log</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="240" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="249" /> <source>Show the log of outgoing changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="242" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251" /> <source><b>Show outgoing log</b><p>This shows the log of changes outgoing out of the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="254" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="252" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="261" /> <source>Push changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="260" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="269" /> <source>Push changes to a remote repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="262" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271" /> <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="274" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="272" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281" /> <source>Push changes (force)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="290" /> <source>Push changes to a remote repository with force option</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="284" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293" /> <source><b>Push changes (force)</b><p>This pushes changes from the local repository to a remote repository using the 'force' option.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="294" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="303" /> <source>Export from repository</source> <translation>从仓库导出</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="296" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="305" /> <source>&Export from repository...</source> <translation>从仓库导出(&E)…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="302" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="311" /> <source>Export a project from the repository</source> <translation>从仓库中导出一个项目</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="313" /> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation><b>从仓库导出</b><p>从仓库导出一个项目。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="313" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="324" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322" /> <source>Show log browser</source> <translation>显示日志浏览器</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="331" /> <source>Show a dialog to browse the log of the local project</source> <translation>显示对话框以浏览本地项目的日志</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="334" /> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation type="unfinished"><b>显示日志浏览器</b><p>显示对话框以浏览本地项目的日志。先显示条目的受限号。稍后可以检索更多信息。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="336" /> - <source>Show differences</source> - <translation type="unfinished">显示差异</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="338" /> - <source>Show &difference</source> - <translation type="unfinished">显示差异(&d)</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="345" /> + <source>Show differences</source> + <translation type="unfinished">显示差异</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347" /> + <source>Show &difference</source> + <translation type="unfinished">显示差异(&d)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="354" /> <source>Show the difference of the local project to the repository</source> <translation>显示本地项目与仓库的差异</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="357" /> <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> <translation type="unfinished"><b>显示差异</b><p>显示本地项目与仓库之间的差异。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="360" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="358" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="369" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="367" /> <source>Show differences (extended)</source> <translation type="unfinished">显示差异（扩展）</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="367" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376" /> <source>Show the difference of revisions of the project to the repository</source> <translation>显示项目的修订版本与仓库的差异</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="370" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379" /> <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="380" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389" /> <source>Show status</source> <translation>显示状态</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="391" /> <source>Show &status...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="388" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="397" /> <source>Show the status of the local project</source> <translation>显示本地项目的状态</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390" /> - <source><b>Show status</b><p>This shows the status of the local project.</p></source> - <translation><b>显示状态</b><p>显示本地项目的状态。</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="399" /> - <source>Show Summary</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="401" /> - <source>Show summary...</source> - <translation type="unfinished" /> + <source><b>Show status</b><p>This shows the status of the local project.</p></source> + <translation><b>显示状态</b><p>显示本地项目的状态。</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408" /> + <source>Show Summary</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="410" /> + <source>Show summary...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="417" /> <source>Show summary information of the working directory status</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="411" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420" /> <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="430" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="430" /> <source>Show heads</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="432" /> <source>Show the heads of the repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="425" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="434" /> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="434" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="443" /> <source>Show parents</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="441" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450" /> <source>Show the parents of the repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="443" /> - <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="452" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="452" /> + <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461" /> <source>Show tip</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="463" /> <source>Show the tip of the repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="456" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="465" /> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="462" /> - <source>Revert changes</source> - <translation type="unfinished">还原改变</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464" /> - <source>Re&vert changes</source> - <translation type="unfinished">还原改变(&v)</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471" /> + <source>Revert changes</source> + <translation type="unfinished">还原改变</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="473" /> + <source>Re&vert changes</source> + <translation type="unfinished">还原改变(&v)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="480" /> <source>Revert all changes made to the local project</source> <translation type="unfinished">还原所有改变到本地项目中</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483" /> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation type="unfinished"><b>还原改变</b><p>还原所有改变到本地项目中。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2110" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2129" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492" /> <source>Merge</source> <translation type="unfinished">合并</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="485" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494" /> <source>Mer&ge changes...</source> <translation type="unfinished">合并更改(&g)…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501" /> <source>Merge changes of a revision into the local project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="495" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="504" /> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="506" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="515" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514" /> <source>Commit Merge</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521" /> <source>Commit all the merged changes.</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="523" /> <source><b>Commit a merge</b><p>This commits a merge working directory</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="523" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="533" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="532" /> <source>Abort Merge</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="531" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540" /> <source>Abort an uncommitted merge and lose all changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="543" /> <source><b>Abort uncommitted merge</b><p>This aborts an uncommitted merge causing all changes to be lost.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="546" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="544" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="553" /> <source>Re-Merge</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="553" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="562" /> <source>Re-Merge all conflicting, unresolved files of the project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="556" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="565" /> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="575" /> <source>Show conflicts</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="576" /> <source>Show conflicts...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="583" /> <source>Show a dialog listing all files with conflicts</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586" /> <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596" /> <source>Conflicts resolved</source> <translation type="unfinished">冲突已解决</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="597" /> <source>Con&flicts resolved</source> <translation type="unfinished">冲突已解决(&F)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604" /> <source>Mark all conflicts of the local project as resolved</source> <translation type="unfinished">将本地项目的所有冲突标记为已解决状态</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="607" /> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished"><b>冲突已解决</b><p>将本地项目中的所有冲突标记为已解决。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617" /> <source>Conflicts unresolved</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625" /> <source>Mark all conflicts of the local project as unresolved</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628" /> <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638" /> <source>Tag in repository</source> <translation>在仓库中标记</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640" /> <source>&Tag in repository...</source> <translation>在仓库中标记(&T)…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="637" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646" /> <source>Tag the local project in the repository</source> <translation>在仓库中标记本地项目</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="639" /> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation><b>在仓库中标记</b><p>在仓库中标记本地项目。</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648" /> - <source>List tags</source> - <translation>列出标签</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="649" /> - <source>List tags...</source> - <translation>列出标签…</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655" /> - <source>List tags of the project</source> - <translation>列出项目的标签</translation> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation><b>在仓库中标记</b><p>在仓库中标记本地项目。</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657" /> - <source><b>List tags</b><p>This lists the tags of the project.</p></source> - <translation><b>列出标签</b><p>列出项目的标签。</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663" /> - <source>List branches</source> - <translation>列出分支</translation> + <source>List tags</source> + <translation>列出标签</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="658" /> + <source>List tags...</source> + <translation>列出标签…</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="664" /> - <source>List branches...</source> - <translation>列出分支…</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670" /> - <source>List branches of the project</source> - <translation>列出项目的分支</translation> + <source>List tags of the project</source> + <translation>列出项目的标签</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666" /> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <translation><b>列出标签</b><p>列出项目的标签。</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672" /> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation><b>列出分支</b><p>列出项目的分支。</p></translation> + <source>List branches</source> + <translation>列出分支</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673" /> + <source>List branches...</source> + <translation>列出分支…</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="679" /> + <source>List branches of the project</source> + <translation>列出项目的分支</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681" /> - <source>Create branch</source> - <translation>创建分支</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="683" /> - <source>Create &branch...</source> - <translation>创建分支(&B)…</translation> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation><b>列出分支</b><p>列出项目的分支。</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="690" /> + <source>Create branch</source> + <translation>创建分支</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692" /> + <source>Create &branch...</source> + <translation>创建分支(&B)…</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699" /> <source>Create a new branch for the local project in the repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="693" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="702" /> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="705" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712" /> <source>Push new branch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721" /> <source>Push the current branch of the local project as a new named branch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="717" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726" /> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="738" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736" /> <source>Close branch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="745" /> <source>Close the current branch of the local project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748" /> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="748" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="758" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757" /> <source>Show current branch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="756" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765" /> <source>Show the current branch of the project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="759" /> - <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768" /> - <source>Switch</source> - <translation type="unfinished">转换</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="770" /> - <source>S&witch...</source> - <translation type="unfinished">转换(&w)…</translation> + <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> + <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777" /> + <source>Switch</source> + <translation type="unfinished">转换</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="779" /> + <source>S&witch...</source> + <translation type="unfinished">转换(&w)…</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786" /> <source>Switch the working directory to another revision</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="780" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="789" /> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799" /> <source>Cleanup</source> <translation type="unfinished">清除</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799" /> <source>Cleanu&p</source> <translation type="unfinished">清除(&P)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="792" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801" /> <source>Cleanup the local project</source> <translation type="unfinished">清除本地项目</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794" /> - <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> - <translation type="unfinished"><b>清除</b><p>执行对本地项目的清除。</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="803" /> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation type="unfinished"><b>清除</b><p>执行对本地项目的清除。</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="812" /> <source>Execute command</source> <translation type="unfinished">执行命令</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813" /> <source>E&xecute command...</source> <translation>执行命令(&X)…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="811" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="820" /> <source>Execute an arbitrary Mercurial command</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="814" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="823" /> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="824" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833" /> <source>Configure</source> <translation>配置</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="834" /> <source>Configure...</source> <translation>配置…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="841" /> <source>Show the configuration dialog with the Mercurial page selected</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="835" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="844" /> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854" /> <source>Edit user configuration</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855" /> <source>Edit user configuration...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="862" /> <source>Show an editor to edit the user configuration file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="856" /> - <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865" /> + <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874" /> <source>Edit repository configuration</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875" /> <source>Edit repository configuration...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="873" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882" /> <source>Show an editor to edit the repository configuration file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="876" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885" /> <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895" /> <source>Show combined configuration settings</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896" /> <source>Show combined configuration settings...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="894" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903" /> <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909" /> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="919" /> <source>Show paths</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="911" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="920" /> <source>Show paths...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="918" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="927" /> <source>Show the aliases for remote repositories</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="921" /> - <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930" /> - <source>Verify repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="931" /> - <source>Verify repository...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937" /> - <source>Verify the integrity of the repository</source> + <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="939" /> - <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> + <source>Verify repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="940" /> + <source>Verify repository...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="946" /> + <source>Verify the integrity of the repository</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="948" /> + <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="957" /> <source>Recover</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="948" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="957" /> <source>Recover...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="951" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960" /> <source>Recover from an interrupted transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="954" /> - <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="963" /> - <source>Identify</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="964" /> - <source>Identify...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="970" /> - <source>Identify the project directory</source> + <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="972" /> + <source>Identify</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973" /> + <source>Identify...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979" /> + <source>Identify the project directory</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="981" /> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="981" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="990" /> <source>Create .hgignore</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="989" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="998" /> <source>Create a .hgignore file with default values</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="992" /> - <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001" /> - <source>Create changegroup</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1003" /> - <source>Create changegroup...</source> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1010" /> + <source>Create changegroup</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1012" /> + <source>Create changegroup...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1019" /> <source>Create changegroup file collecting changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1013" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1022" /> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1023" /> - <source>Preview changegroup</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1025" /> - <source>Preview changegroup...</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032" /> + <source>Preview changegroup</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1034" /> + <source>Preview changegroup...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041" /> <source>Preview a changegroup file containing a collection of changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044" /> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2244" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1045" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2263" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054" /> <source>Apply changegroups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1047" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056" /> <source>Apply changegroups...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063" /> <source>Apply one or several changegroup files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066" /> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1067" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1076" /> <source>Mark as "good"</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1068" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1077" /> <source>Mark as "good"...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1075" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1084" /> <source>Mark a selectable changeset as good</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1078" /> - <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1087" /> - <source>Mark as "bad"</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088" /> - <source>Mark as "bad"...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1094" /> - <source>Mark a selectable changeset as bad</source> + <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1096" /> - <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> + <source>Mark as "bad"</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1097" /> + <source>Mark as "bad"...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1103" /> + <source>Mark a selectable changeset as bad</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105" /> + <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1114" /> <source>Skip</source> <translation type="unfinished">跳过</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1114" /> <source>Skip...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1107" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1116" /> <source>Skip a selectable changeset</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1109" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1118" /> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1115" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1115" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124" /> <source>Reset</source> <translation type="unfinished">重置</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1117" /> - <source>Reset the bisect search data</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119" /> - <source><b>Reset</b><p>This resets the bisect search data.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1126" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1125" /> + <source>Reset the bisect search data</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128" /> + <source><b>Reset</b><p>This resets the bisect search data.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1135" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134" /> <source>Back out changeset</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1133" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1142" /> <source>Back out changes of an earlier changeset</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1136" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1145" /> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1146" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1145" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1155" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154" /> <source>Rollback last transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1152" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1161" /> <source>Rollback the last transaction</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1163" /> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1176" /> - <source>Serve project repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1177" /> - <source>Serve project repository...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183" /> - <source>Serve the project repository</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185" /> + <source>Serve project repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1186" /> + <source>Serve project repository...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1192" /> + <source>Serve the project repository</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1194" /> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2301" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1194" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2320" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1203" /> <source>Import Patch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1196" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1205" /> <source>Import Patch...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1202" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211" /> <source>Import a patch from a patch file</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1204" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1213" /> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1214" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1223" /> <source>Export Patches</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1216" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1225" /> <source>Export Patches...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1222" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1231" /> <source>Export revisions to patch files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1224" /> - <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1233" /> - <source>Change Phase</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234" /> - <source>Change Phase...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1240" /> - <source>Change the phase of revisions</source> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1242" /> + <source>Change Phase</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1243" /> + <source>Change Phase...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1249" /> + <source>Change the phase of revisions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251" /> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2343" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1804" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1253" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2362" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1822" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1262" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1260" /> <source>Copy Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1259" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1268" /> <source>Copies changesets from another branch</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1261" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270" /> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1273" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1272" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1282" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1281" /> <source>Continue Copying Session</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1280" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1289" /> <source>Continue the last copying session after conflicts were resolved</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1283" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1292" /> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1294" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1293" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1303" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1302" /> <source>Stop Copying Session</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1301" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1310" /> <source>Stop the interrupted copying session</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1304" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1313" /> <source><b>Stop Copying Session</b><p>This stops the interrupted copying session.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1314" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1313" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1323" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1322" /> <source>Abort Copying Session</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1321" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330" /> <source>Abort the interrupted copying session and rollback</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1324" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1333" /> <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1334" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1343" /> <source>Add</source> <translation type="unfinished">添加</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1336" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1345" /> <source>Add...</source> <translation type="unfinished">添加…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1342" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1351" /> <source>Add a sub-repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1344" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1353" /> <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1350" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1359" /> <source>Remove</source> <translation type="unfinished">移除</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1352" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1361" /> <source>Remove...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1358" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367" /> <source>Remove sub-repositories</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1360" /> - <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1369" /> - <source>Create unversioned archive</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1371" /> - <source>Create unversioned archive...</source> + <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1378" /> + <source>Create unversioned archive</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1380" /> + <source>Create unversioned archive...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1387" /> <source>Create an unversioned archive from the repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1381" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1390" /> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1391" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1400" /> <source>List bookmarks</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1393" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1402" /> <source>List bookmarks...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1399" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1408" /> <source>List bookmarks of the project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1401" /> - <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1410" /> - <source>Define bookmark</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1412" /> - <source>Define bookmark...</source> + <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1419" /> + <source>Define bookmark</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1421" /> + <source>Define bookmark...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1428" /> <source>Define a bookmark for the project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1422" /> - <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1431" /> - <source>Delete bookmark</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1433" /> - <source>Delete bookmark...</source> + <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1440" /> + <source>Delete bookmark</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1442" /> + <source>Delete bookmark...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1449" /> <source>Delete a bookmark of the project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1443" /> - <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1452" /> - <source>Rename bookmark</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1454" /> - <source>Rename bookmark...</source> + <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1461" /> + <source>Rename bookmark</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1463" /> + <source>Rename bookmark...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1470" /> <source>Rename a bookmark of the project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1464" /> - <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1473" /> + <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1482" /> <source>Move bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1475" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1484" /> <source>Move bookmark...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1481" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1490" /> <source>Move a bookmark of the project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1483" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1492" /> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1495" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1493" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1504" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1502" /> <source>Show incoming bookmarks</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1502" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1511" /> <source>Show a list of incoming bookmarks</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1505" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1514" /> <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1517" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1515" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1526" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1524" /> <source>Pull bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1524" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1533" /> <source>Pull a bookmark from a remote repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1527" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1536" /> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1539" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1537" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1548" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1546" /> <source>Pull current bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1546" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1555" /> <source>Pull the current bookmark from a remote repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1549" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1558" /> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1560" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1558" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1569" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1567" /> <source>Show outgoing bookmarks</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1567" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1576" /> <source>Show a list of outgoing bookmarks</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1570" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1579" /> <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1582" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1580" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1591" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1589" /> <source>Push bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1589" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1598" /> <source>Push a bookmark to a remote repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1592" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1601" /> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1604" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1602" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1613" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1611" /> <source>Push current bookmark</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1611" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1620" /> <source>Push the current bookmark to a remote repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1614" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1623" /> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1626" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1624" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1635" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1633" /> <source>Push all bookmarks</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1633" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1642" /> <source>Push all bookmarks to a remote repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1636" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1645" /> <source><b>Push all bookmarks</b><p>This pushes all bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1647" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1645" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1656" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1654" /> <source>Delete all backups</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1654" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1663" /> <source>Delete all backup bundles stored in the backup area</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1657" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1666" /> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1699" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1708" /> <source>Administration</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1724" /> - <source>Specials</source> - <translation type="unfinished">特殊</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1733" /> + <source>Specials</source> + <translation type="unfinished">特殊</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1742" /> <source>Changegroup Management</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1740" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1749" /> <source>Patch Management</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1746" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1755" /> <source>Bisect</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1754" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1763" /> <source>Tags</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1761" /> - <source>Branches</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1770" /> + <source>Branches</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1779" /> <source>Bookmarks</source> <translation type="unfinished">书签</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1791" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1800" /> + <source>Other Functions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1809" /> <source>Extensions</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1813" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1831" /> <source>Sub-Repository</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1818" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1836" /> <source>Merge Changesets</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1903" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1901" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1922" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1920" /> <source>Mercurial</source> <translation type="unfinished">Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2054" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2073" /> <source>Pull</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2391" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2375" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2360" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2344" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2323" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2302" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2245" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2055" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2410" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2394" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2379" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2363" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2342" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2321" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2264" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2074" /> <source>The project should be reread. Do this now?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2322" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2341" /> <source>Revert Changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2359" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2378" /> <source>Copy Changesets (Continue)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2374" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2393" /> <source>Copy Changesets (Stop)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2390" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2409" /> <source>Copy Changesets (Abort)</source> <translation type="unfinished" /> </message> @@ -40670,7 +40870,7 @@ <context> <name>HgPurgeListDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/HgPurgeListDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/HgPurgeListDialog.ui" line="0" /> <source>Purge List</source> <translation type="unfinished" /> </message> @@ -41840,101 +42040,101 @@ <context> <name>HgShelveBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Mercurial Shelve Browser</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Name</source> <translation type="unfinished">名称</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Age</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Message</source> <translation type="unfinished">消息</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Statistics</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>File</source> <translation type="unfinished">文件</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Lines added</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Lines deleted</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source>Errors</source> <translation type="unfinished">错误</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.ui" line="0" /> <source><b>Mercurial shelve errors</b><p>This shows possible error messages of the hg shelve command.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="58" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="58" /> <source>&Refresh</source> <translation type="unfinished">刷新(&R)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="60" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="60" /> <source>Press to refresh the list of shelves</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="69" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="69" /> <source>Restore selected shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="72" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="72" /> <source>Delete selected shelves</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="75" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="75" /> <source>Delete all shelves</source> <translation type="unfinished" /> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="290" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="290" /> <source>%n file(s) changed</source> <translation> <numerusform /> </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="292" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="292" /> <source>%n line(s) inserted</source> <translation> <numerusform /> </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="295" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveBrowserDialog.py" line="295" /> <source>%n line(s) deleted</source> <translation> <numerusform /> @@ -41944,57 +42144,57 @@ <context> <name>HgShelveDataDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Name:</source> <translation type="unfinished">名称：</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Enter a name for the shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Date, Time:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Enter the commit date and time for the shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>yyyy-MM-dd HH:mm</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Message:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Enter a message for the shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Mark new/missing files as added/removed</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Select to shelve, but keep the changes in the working directory</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelveDataDialog.ui" line="0" /> <source>Shelve, but keep changes</source> <translation type="unfinished" /> </message> @@ -42002,7 +42202,7 @@ <context> <name>HgShelvesSelectionDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelvesSelectionDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgShelvesSelectionDialog.ui" line="0" /> <source>Mercurial Shelve Selection</source> <translation type="unfinished" /> </message> @@ -42305,124 +42505,20 @@ <context> <name>HgStripDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Strip Changesets</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>&Revision</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> <source>Select to specify a revision by number</source> - <translation type="unfinished">选择通过号码指定一个修订</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">选择通过号码指定一个修订</translation> + </message> + <message> <source>Number</source> - <translation type="unfinished">号码</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">号码</translation> + </message> + <message> <source>Enter a revision number</source> - <translation type="unfinished">输入一个修订号</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to specify a revision by changeset id</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Id:</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enter a changeset id</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to specify a revision by a tag</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Tag:</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enter a tag name</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to specify a revision by a branch</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Branch:</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enter a branch name</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> + <translation type="vanished">输入一个修订号</translation> + </message> + <message> <source>Expression:</source> - <translation type="unfinished">表达式：</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enter a revision set expression</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Bookmark:</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enter a bookmark name</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to enforce removal of changesets</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Enforce Operation</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to not create backup bundles</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>No Backup</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Select to keep the current working directory state</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.ui" line="0" /> - <source>Keep Working Directory</source> - <translation type="unfinished" /> + <translation type="vanished">表达式：</translation> </message> </context> <context> @@ -42921,29 +43017,124 @@ </message> </context> <context> + <name>HgUncommitDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Undo Local Commit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Commit Message</source> + <translation type="unfinished">提交消息</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Enter the log message.</source> + <translation type="unfinished">输入日志消息。</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source><b>Log Message</b> +<p>Enter the log message for the uncommit action.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Recent commit messages</source> + <translation type="unfinished">最近提交消息</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Select a recent commit message to use</source> + <translation type="unfinished">选择使用一个最近提交消息</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Select to allow an empty commit after undoing it.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Allow empty commit after undoing commit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Select to allow undoing the commit with outstanding changes.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Allow undoing commit with outstanding changes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Author</source> + <translation type="unfinished">作者</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Enter author name to override the configured user:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Enter an author name in order to override the configured one</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Select to give date and time information</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Date and Time</source> + <translation type="unfinished">日期和时间</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Date/Time:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/HgUncommitDialog.ui" line="0" /> + <source>Enter the date and time to be used</source> + <translation type="unfinished" /> + </message> + <message> + <source><b>Log Message</b> +<p>Enter the log message for the commit action.</p></source> + <translation type="vanished"><b>日志消息</b> +<p>为提交动作输入日志消息。</p></translation> + </message> + </context> + <context> <name>HgUnshelveDataDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Mercurial Unshelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Name:</source> <translation type="unfinished">名称：</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Enter the name of the shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Select to keep the shelved change</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="0" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/HgUnshelveDataDialog.ui" line="0" /> <source>Keep shelved change</source> <translation type="unfinished" /> </message> @@ -43013,22 +43204,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> @@ -43044,52 +43235,42 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the Purge 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>Purge</source> + <source>Histedit</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the queues extension</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Queues</source> + <source>Select to activate the GPG 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>GPG</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Rebase</source> + <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 shelve extension</source> + <source>Fastexport</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Shelve</source> + <source>Select to activate the uncommit extension</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the strip extension</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Strip</source> + <source>Uncommit</source> <translation type="unfinished" /> </message> <message> @@ -43309,32 +43490,32 @@ <translation type="unfinished">默认</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="527" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="474" /> <source>Delete Host Fingerprint</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="528" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="475" /> <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="644" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="591" /> <source>Delete Host Minimum Protocol</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="645" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="592" /> <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="708" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="655" /> <source>Edit User Configuration</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="709" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="656" /> <source>You will loose all changes made in this dialog. Shall the data be saved first?</source> <translation type="unfinished" /> </message> @@ -43413,17 +43594,17 @@ <context> <name>HgUtilities</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="130" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="132" /> <source>The hg process finished with the exit code {0}</source> <translation type="unfinished">hg 进程已结束，返回值为 {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="134" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="136" /> <source>The hg process did not finish within 30s.</source> <translation type="unfinished">hg 进程没有在 30 秒内结束。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="138" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="140" /> <source>Could not start the hg executable.</source> <translation type="unfinished">无法启动 hg 可执行程序。</translation> </message> @@ -50719,13 +50900,13 @@ <name>Lexers</name> <message> <location filename="../QScintilla/Lexers/__init__.py" line="412" /> - <location filename="../Preferences/__init__.py" line="599" /> + <location filename="../Preferences/__init__.py" line="598" /> <source>Python Files (*.py *.py3)</source> <translation type="unfinished">Python 文件 (*.py *.py3)</translation> </message> <message> <location filename="../QScintilla/Lexers/__init__.py" line="505" /> - <location filename="../Preferences/__init__.py" line="602" /> + <location filename="../Preferences/__init__.py" line="601" /> <source>Python3 Files (*.py)</source> <translation type="unfinished" /> </message> @@ -52564,8 +52745,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> @@ -53923,7 +54104,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> @@ -60261,74 +60442,12 @@ </message> <message> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to install the selected package</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to install the selected package to the user site</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to show details for the selected entry</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Toggle to show or hide the search window</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Package</source> + <source>Press to refresh the lists</source> <translation type="unfinished" /> </message> <message> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Enter the search term for the package name</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Enter search term</source> - <translation type="unfinished">输入搜索词</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to start the search</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to search for more packages</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Version</source> - <translation type="unfinished">版本</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Released</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Description</source> - <translation type="unfinished">描述</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> - <source>Press to refresh the lists</source> + <source>Press to install a package.</source> <translation type="unfinished" /> </message> <message> @@ -60348,6 +60467,17 @@ </message> <message> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Press to show details for the selected entry</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Press to remove leftovers of an upgrade or uninstall run.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> <source>Select to show only locally-installed packages</source> <translation type="unfinished" /> </message> @@ -60391,6 +60521,13 @@ <message> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Package</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> <source>Installed</source> <translation type="unfinished" /> </message> @@ -60485,318 +60622,336 @@ <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="199" /> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Search Package:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Enter package name to search for.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.ui" line="0" /> + <source>Press to open a web browser for searching.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="83" /> <source>pip Menu</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="233" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="113" /> <source>Author:</source> <translation type="unfinished">作者：</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="234" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="114" /> <source>Author Email:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="235" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="115" /> <source>Classifiers:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="236" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="116" /> <source>Entry Points:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="237" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="117" /> <source>Files:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="238" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="118" /> <source>Homepage:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="239" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="119" /> <source>Installer:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="240" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="120" /> <source>License:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="241" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="121" /> <source>Location:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="242" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="122" /> <source>Metadata Version:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="243" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="123" /> <source>Name:</source> <translation type="unfinished">名称：</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="244" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="124" /> <source>Project URLs:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="245" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="125" /> <source>Requires:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="246" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="126" /> <source>Required By:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="247" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="127" /> <source>Summary:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="248" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="128" /> <source>Version:</source> <translation type="unfinished">版本：</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="450" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="335" /> <source>Getting installed packages...</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="478" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="363" /> <source>Getting outdated packages...</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1231" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1051" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1038" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1002" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="735" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="729" /> + <source>Cleanup Environment</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="730" /> + <source>The environment cleanup was successful.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="736" /> + <source>Some leftover package directories could not been removed. Delete them manually.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="834" /> <source>Search PyPI</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1003" /> - <source><p>Received an error while searching for <b>{0}</b>.</p><p>Error: {1}</p></source> - <translation type="unfinished" /> - </message> - <message numerus="yes"> - <location filename="../PipInterface/PipPackagesWidget.py" line="1018" /> - <source>%n package(s) found.</source> - <translation type="unfinished"> - <numerusform /> - </translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1025" /> - <source>Showing first {0} packages found.</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1044" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1039" /> - <source><p>There were no results for <b>{0}</b>.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1052" /> - <source><p>There were no more results for <b>{0}</b>.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1232" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="835" /> <source><p>No package details info for <b>{0}</b> available.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1251" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="854" /> <source>Pip</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1253" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="856" /> <source>Install Pip</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1256" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="859" /> <source>Install Pip to User-Site</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1259" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="862" /> <source>Repair Pip</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1266" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="869" /> <source>Install</source> <translation type="unfinished">安装</translation> </message> <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1048" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="871" /> + <source>Install Packages</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="874" /> + <source>Install Local Package</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="877" /> + <source>Re-Install Selected Packages</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="884" /> + <source>Requirements/Constraints</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="886" /> + <source>Install Requirements</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="889" /> + <source>Uninstall Requirements</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="892" /> + <source>Generate Requirements...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="896" /> + <source>Install from 'pyproject.toml'</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="900" /> + <source>Uninstall from 'pyproject.toml'</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="905" /> + <source>Generate Constraints...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="912" /> + <source>Cache</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="914" /> + <source>Show Cache Info...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="917" /> + <source>Show Cached Files...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="920" /> + <source>Remove Cached Files...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="923" /> + <source>Purge Cache...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="940" /> + <source>Show Licenses...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="944" /> + <source>Check Vulnerabilities</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="948" /> + <source>Update Vulnerability Database</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="952" /> + <source>Create SBOM file</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="959" /> + <source>Edit User Configuration...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="962" /> + <source>Edit Environment Configuration...</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="967" /> + <source>Configure...</source> + <translation type="unfinished">配置…</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1211" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1198" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1187" /> + <source>Edit Configuration</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1212" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1199" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1188" /> + <source>No valid configuration path determined. Aborting</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1421" /> + <source>{0} {1}</source> + <comment>package name, package version</comment> + <translation type="unfinished">{0} {1}</translation> + </message> + <message> + <location filename="../PipInterface/PipPackagesWidget.py" line="1442" /> + <source>Affected Version:</source> + <translation type="unfinished" /> + </message> + <message> <location filename="../PipInterface/PipPackagesWidget.py" line="1445" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1268" /> - <source>Install Packages</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1271" /> - <source>Install Local Package</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1274" /> - <source>Re-Install Selected Packages</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1281" /> - <source>Requirements/Constraints</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1283" /> - <source>Install Requirements</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1286" /> - <source>Uninstall Requirements</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1289" /> - <source>Generate Requirements...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1293" /> - <source>Install from 'pyproject.toml'</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1297" /> - <source>Uninstall from 'pyproject.toml'</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1302" /> - <source>Generate Constraints...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1309" /> - <source>Cache</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1311" /> - <source>Show Cache Info...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1314" /> - <source>Show Cached Files...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1317" /> - <source>Remove Cached Files...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1320" /> - <source>Purge Cache...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1337" /> - <source>Show Licenses...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1341" /> - <source>Check Vulnerabilities</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1345" /> - <source>Update Vulnerability Database</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1349" /> - <source>Create SBOM file</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1356" /> - <source>Edit User Configuration...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1359" /> - <source>Edit Environment Configuration...</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1364" /> - <source>Configure...</source> - <translation type="unfinished">配置…</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1608" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1595" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1584" /> - <source>Edit Configuration</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1609" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1596" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1585" /> - <source>No valid configuration path determined. Aborting</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1818" /> - <source>{0} {1}</source> - <comment>package name, package version</comment> - <translation type="unfinished">{0} {1}</translation> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1839" /> - <source>Affected Version:</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1842" /> <source>Advisory:</source> <translation type="unfinished" /> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1977" /> - <location filename="../PipInterface/PipPackagesWidget.py" line="1952" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1580" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1555" /> <source>unknown</source> <translation type="unfinished">未知</translation> </message> <message> - <location filename="../PipInterface/PipPackagesWidget.py" line="1974" /> + <location filename="../PipInterface/PipPackagesWidget.py" line="1577" /> <source>any</source> <translation type="unfinished" /> </message> + <message> + <source>Enter search term</source> + <translation type="vanished">输入搜索词</translation> + </message> + <message> + <source>Version</source> + <translation type="vanished">版本</translation> + </message> + <message> + <source>Description</source> + <translation type="vanished">描述</translation> + </message> + <message numerus="yes"> + <source>%n package(s) found.</source> + <translation type="vanished"> + <numerusform /> + </translation> + </message> </context> <context> <name>PipPackagesWindow</name> @@ -61629,64 +61784,69 @@ <name>PluginRepositoryWidget</name> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="124" /> - <source>Stable</source> - <translation>稳定</translation> + <source>Obsolete</source> + <translation type="unfinished" /> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="125" /> - <source>Unstable</source> - <translation>不稳定</translation> + <source>Stable</source> + <translation>稳定</translation> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="126" /> - <source>Obsolete</source> - <translation type="unfinished" /> + <source>Unknown</source> + <translation>未知</translation> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="127" /> - <source>Unknown</source> - <translation>未知</translation> - </message> - <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="179" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="139" /> - <source>Update</source> - <translation>更新</translation> + <source>Unstable</source> + <translation>不稳定</translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="128" /> + <source>Upgrade Available</source> + <translation type="unfinished" /> </message> <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="182" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="145" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="142" /> + <source>Update</source> + <translation>更新</translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="185" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="148" /> <source>Download</source> <translation>下载</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="153" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="156" /> <source>Download & Install</source> <translation type="unfinished" /> </message> <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="191" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="164" /> + <source>Cancel</source> + <translation>取消</translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="170" /> + <source>Install</source> + <translation type="unfinished">安装</translation> + </message> + <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="188" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="161" /> - <source>Cancel</source> - <translation>取消</translation> - </message> - <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="167" /> - <source>Install</source> - <translation type="unfinished">安装</translation> - </message> - <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="185" /> <source>Download && Install</source> <translation>下载并安装</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="191" /> - <source>Close && Install</source> - <translation>关闭与安装</translation> - </message> - <message> <location filename="../PluginManager/PluginRepositoryDialog.py" line="194" /> + <source>Close && Install</source> + <translation>关闭与安装</translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="197" /> <source>Close</source> <translation type="unfinished">关闭</translation> </message> @@ -61738,98 +61898,103 @@ <translation>所需插件已下载。</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="603" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="591" /> <source>Plugins Repository URL Changed</source> <translation>插件仓库 URL 已改变</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="604" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="592" /> <source>The URL of the Plugins Repository has changed. Select the "Update" button to get the new repository file.</source> <translation>插件仓库的 URL 已经改变。选择“更新”按钮来获取新的仓库文件。</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="613" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="601" /> <source>Read plugins repository file</source> <translation>读取插件仓库文件</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="614" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="602" /> <source><p>The plugins repository file <b>{0}</b> could not be read. Select Update</p></source> <translation><p>插件仓库文件 <b>{0}</b> 无法读取。选择更新</p></translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="623" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="611" /> <source>No plugin repository file available. Select Update.</source> <translation>无有效的插件仓库文件。 选择更新。</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="627" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="615" /> <source>New: <b>{0}</b></source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="629" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="617" /> <source>Local Updates: <b>{0}</b></source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="632" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="620" /> <source>Remote Updates: <b>{0}</b></source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="705" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="673" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="693" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="661" /> <source>Error downloading file</source> <translation>下载文件出错</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="706" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="674" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="694" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="662" /> <source><p>Could not download the requested file from {0}.</p><p>Error: {1}</p></source> <translation><p>无法从 {0} 下载指定文件。</p><p>错误：{1}</p></translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="677" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="665" /> <source>No connection to Internet.</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="849" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="810" /> <source>up-to-date</source> <translation>最新</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="852" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="813" /> <source>new download available</source> <translation>新的下载可用</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="856" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="818" /> <source>update installable</source> <translation>更新可安装</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="860" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="823" /> <source>updated download available</source> <translation>更新下载可用</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="864" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="828" /> <source>error determining status</source> <translation type="unfinished" /> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1269" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1239" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1002" /> + <source>{0}. {1}</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1346" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1316" /> <source>Cleanup of Plugin Downloads</source> <translation>清理插件安装</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1273" /> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1242" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1350" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1319" /> <source><p>The plugin download <b>{0}</b> could not be deleted.</p><p>Reason: {1}</p></source> <translation><p>插件下载 <b>{0}</b> 无法删除。</p><p>原因：{1}</p></translation> </message> @@ -61837,17 +62002,17 @@ <context> <name>PluginRepositoryWindow</name> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1126" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1203" /> <source>Process Generation Error</source> <translation>进程生成错误</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1127" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1204" /> <source><p>Could not start the process.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>无法启动进程。<br>请确保它作为 <b>{0}</b> 可用。</p></translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="1131" /> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="1208" /> <source>OK</source> <translation>确定</translation> </message> @@ -62224,18 +62389,18 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1908" /> + <location filename="../Preferences/__init__.py" line="1909" /> <source>Export Preferences</source> <translation>导出首选项</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1937" /> - <location filename="../Preferences/__init__.py" line="1910" /> + <location filename="../Preferences/__init__.py" line="1938" /> + <location filename="../Preferences/__init__.py" line="1911" /> <source>Properties File (*.ini);;All Files (*)</source> <translation>属性文件 (*.ini);;所有文件 (*)</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1935" /> + <location filename="../Preferences/__init__.py" line="1936" /> <source>Import Preferences</source> <translation>导入首选项</translation> </message> @@ -62797,79 +62962,79 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="273" /> + <location filename="../Preferences/ProgramsDialog.py" line="275" /> <source>PyPI Package Management</source> <translation type="unfinished">PyPi包管理</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="525" /> - <location filename="../Preferences/ProgramsDialog.py" line="522" /> - <location filename="../Preferences/ProgramsDialog.py" line="506" /> - <location filename="../Preferences/ProgramsDialog.py" line="376" /> - <location filename="../Preferences/ProgramsDialog.py" line="309" /> - <location filename="../Preferences/ProgramsDialog.py" line="292" /> + <location filename="../Preferences/ProgramsDialog.py" line="527" /> + <location filename="../Preferences/ProgramsDialog.py" line="524" /> + <location filename="../Preferences/ProgramsDialog.py" line="508" /> + <location filename="../Preferences/ProgramsDialog.py" line="378" /> + <location filename="../Preferences/ProgramsDialog.py" line="311" /> + <location filename="../Preferences/ProgramsDialog.py" line="294" /> <source>(unknown)</source> <translation>（未知）</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="296" /> + <location filename="../Preferences/ProgramsDialog.py" line="298" /> <source>Spell Checker - PyEnchant</source> <translation>拼写检查器——PyEnchant</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="313" /> + <location filename="../Preferences/ProgramsDialog.py" line="315" /> <source>Source Highlighter - Pygments</source> <translation>代码高亮工具——Pygments</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="320" /> + <location filename="../Preferences/ProgramsDialog.py" line="322" /> <source>MicroPython - MPY Cross Compiler</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="327" /> + <location filename="../Preferences/ProgramsDialog.py" line="329" /> <source>MicroPython - ESP Tool</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="338" /> + <location filename="../Preferences/ProgramsDialog.py" line="340" /> <source>MicroPython - PyBoard Flasher</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="348" /> + <location filename="../Preferences/ProgramsDialog.py" line="350" /> <source>MicroPython - STLink Info</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="358" /> + <location filename="../Preferences/ProgramsDialog.py" line="360" /> <source>MicroPython - STLink Flasher</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="380" /> + <location filename="../Preferences/ProgramsDialog.py" line="382" /> <source>Code Assistant - Jedi</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="460" /> + <location filename="../Preferences/ProgramsDialog.py" line="462" /> <source>(not configured)</source> <translation>（未配置）</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="495" /> + <location filename="../Preferences/ProgramsDialog.py" line="497" /> <source>(module not found)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="528" /> + <location filename="../Preferences/ProgramsDialog.py" line="530" /> <source>(not executable)</source> <translation>（不可执行）</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="574" /> + <location filename="../Preferences/ProgramsDialog.py" line="576" /> + <location filename="../Preferences/ProgramsDialog.py" line="544" /> <location filename="../Preferences/ProgramsDialog.py" line="542" /> - <location filename="../Preferences/ProgramsDialog.py" line="540" /> <source>(not found)</source> <translation>（未找到）</translation> </message> @@ -67073,7 +67238,7 @@ <translation>Alt+R</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="306" /> + <location filename="../Project/PropertiesDialog.py" line="312" /> <location filename="../Project/PropertiesDialog.py" line="71" /> <source>None</source> <translation type="unfinished">无</translation> @@ -67099,12 +67264,12 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="261" /> + <location filename="../Project/PropertiesDialog.py" line="267" /> <source>Source Files ({0});;All Files (*)</source> <translation>源文件 ({0});;所有文件 (*)</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="265" /> + <location filename="../Project/PropertiesDialog.py" line="271" /> <source>All Files (*)</source> <translation type="unfinished">所有文件 (*)</translation> </message> @@ -67145,22 +67310,22 @@ <context> <name>Purge</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="76" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/purge.py" line="83" /> <source>Purge All Files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="77" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/purge.py" line="84" /> <source>Do really want to delete all files not tracked by Mercurial (including ignored ones)?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="82" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/purge.py" line="89" /> <source>Purge Files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="83" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/purge.py" line="90" /> <source>Do really want to delete files not tracked by Mercurial?</source> <translation type="unfinished" /> </message> @@ -67168,79 +67333,115 @@ <context> <name>PurgeProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="36" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="34" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="36" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="34" /> <source>Purge Files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="43" /> - <source>Delete files and directories not known to Mercurial</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="46" /> - <source><b>Purge Files</b><p>This deletes files and directories not known to Mercurial. That means that purge will delete:<ul><li>unknown files (marked with "not tracked" in the status dialog)</li><li>empty directories</li></ul>Note that ignored files will be left untouched.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="61" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="60" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="43" /> + <source>Delete not version controlled files and directories</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="46" /> + <source><b>Purge Files</b><p>This deletes not version controlled files and directories. That means that purge will delete:<ul><li>not version controlled files (marked with "not tracked" in the status dialog)</li><li>empty directories</li></ul>Note that ignored files will be left untouched.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="61" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="60" /> <source>Purge All Files</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="68" /> - <source>Delete files and directories not known to Mercurial including ignored ones</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="74" /> - <source><b>Purge All Files</b><p>This deletes files and directories not known to Mercurial. That means that purge will delete:<ul><li>unknown files (marked with "not tracked" in the status dialog)</li><li>empty directories</li><li>ignored files and directories</li></ul></p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="89" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="68" /> + <source>Delete not version controlled files and directories including ignored ones</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="74" /> + <source><b>Purge All Files</b><p>This deletes not version controlled files and directories. That means that purge will delete:<ul><li>not version controlled files (marked with "not tracked" in the status dialog)</li><li>empty directories</li><li>ignored files and directories</li></ul></p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="90" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="89" /> + <source>Purge Ignored Files</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="97" /> + <source>Delete ignored files and directories</source> + <translation type="unfinished" /> + </message> + <message> + <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/PurgeExtension/ProjectHelper.py" line="91" /> + <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/PurgeExtension/ProjectHelper.py" line="98" /> - <source>List files and directories not known to Mercurial</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="101" /> - <source><b>List Files to be Purged</b><p>This lists files and directories not known to Mercurial. These would be deleted by the "Purge Files" menu entry.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="111" /> + <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="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="131" /> <source>List All Files to be Purged</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="112" /> + <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/PurgeExtension/ProjectHelper.py" line="119" /> - <source>List files and directories not known to Mercurial including ignored ones</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py" line="125" /> - <source><b>List All Files to be Purged</b><p>This lists files and directories not known to Mercurial 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/PurgeExtension/ProjectHelper.py" line="163" /> + <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="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="156" /> + <source>List Ignored Files to be Purged</source> + <translation type="unfinished" /> + </message> + <message> + <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="164" /> + <source>List ignored files and directories</source> + <translation type="unfinished" /> + </message> + <message> + <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="206" /> <source>Purge</source> <translation type="unfinished" /> </message> @@ -76189,49 +76390,49 @@ <context> <name>Shelve</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="105" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="105" /> <source>Shelve current changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="151" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="151" /> <source>Restore shelved changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="170" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="170" /> <source>Abort restore operation</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="191" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="191" /> <source>Continue restore operation</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="211" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="211" /> <source>Select the shelves to be deleted:</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="231" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="222" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="231" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="222" /> <source>Delete shelves</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="223" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="223" /> <source>Do you really want to delete these shelves?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="249" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="242" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="249" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="242" /> <source>Delete all shelves</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="243" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/shelve.py" line="243" /> <source>Do you really want to delete all shelved changes?</source> <translation type="unfinished" /> </message> @@ -76239,21 +76440,21 @@ <context> <name>ShelveProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="62" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="57" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="52" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="47" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="62" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="57" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="52" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="47" /> <source>Shelve changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="122" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="74" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="122" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="74" /> <source>Shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="104" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectBrowserHelper.py" line="104" /> <source>The project should be reread. Do this now?</source> <translation type="unfinished" /> </message> @@ -76261,154 +76462,154 @@ <context> <name>ShelveProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="34" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="34" /> <source>Shelve changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="35" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="35" /> <source>Shelve changes...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="42" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="42" /> <source>Shelve all current changes of the project</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="45" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="45" /> <source><b>Shelve changes</b><p>This shelves all current changes of the project.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="54" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="54" /> <source>Show shelve browser</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="55" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="55" /> <source>Show shelve browser...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="61" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="61" /> <source>Show a dialog with all shelves</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="63" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="63" /> <source><b>Show shelve browser...</b><p>This shows a dialog listing all available shelves. Actions on these shelves may be executed via the context menu.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="74" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="74" /> <source>Restore shelved change</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="75" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="75" /> <source>Restore shelved change...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="82" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="82" /> <source>Restore a shelved change to the project directory</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="85" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="85" /> <source><b>Restore shelved change</b><p>This restore a shelved change to the project directory.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="95" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="95" /> <source>Abort restore</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="96" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="96" /> <source>Abort restore...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="103" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="103" /> <source>Abort the restore operation in progress</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="106" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="106" /> <source><b>Abort restore</b><p>This aborts the restore operation in progress and reverts already applied changes.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="116" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="116" /> <source>Continue restore</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="117" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="117" /> <source>Continue restore...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="124" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="124" /> <source>Continue the restore operation in progress</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="127" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="127" /> <source><b>Continue restore</b><p>This continues the restore operation in progress.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="136" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="136" /> <source>Delete shelved changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="137" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="137" /> <source>Delete shelved changes...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="144" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="144" /> <source><b>Delete shelved changes...</b><p>This opens a dialog to select the shelved changes to delete and deletes the selected ones.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="155" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="154" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="155" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="154" /> <source>Delete ALL shelved changes</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="162" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="162" /> <source><b>Delete ALL shelved changes</b><p>This deletes all shelved changes.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="231" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="202" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="231" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="202" /> <source>Shelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="218" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="218" /> <source>The project should be reread. Do this now?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="244" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="244" /> <source>Unshelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="251" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="251" /> <source>Abort Unshelve</source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="258" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveBuiltin/ProjectHelper.py" line="258" /> <source>Continue Unshelve</source> <translation type="unfinished" /> </message> @@ -79038,44 +79239,6 @@ </message> </context> <context> - <name>Strip</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/strip.py" line="68" /> - <source>Stripping changesets from repository</source> - <translation type="unfinished" /> - </message> - </context> - <context> - <name>StripProjectHelper</name> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="37" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="35" /> - <source>Strip changesets</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="43" /> - <source>Strip changesets from a repository</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="45" /> - <source><b>Strip changesets</b><p>This deletes a changeset and all its descendants from a repository. Each removed changeset will be stored in .hg/strip-backup as a bundle file.</p></source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="91" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="79" /> - <source>Strip</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="92" /> - <source>The project should be reread. Do this now?</source> - <translation type="unfinished" /> - </message> - </context> - <context> <name>SubstyleDefinitionDialog</name> <message> <location filename="../Preferences/SubstyleDefinitionDialog.py" line="44" /> @@ -80183,12 +80346,12 @@ <context> <name>SvnDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="165" /> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="168" /> <source>Process Generation Error</source> <translation>进程生成错误</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="166" /> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="169" /> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> @@ -90666,6 +90829,66 @@ </message> </context> <context> + <name>Uncommit</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/uncommit.py" line="64" /> + <source>Undo Local Commit</source> + <translation type="unfinished" /> + </message> + </context> + <context> + <name>UncommitProjectBrowserHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="145" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="82" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="72" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="62" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="52" /> + <source>Undo Local Commit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="96" /> + <source>Uncommit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectBrowserHelper.py" line="126" /> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished" /> + </message> + </context> + <context> + <name>UncommitProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="107" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="38" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="36" /> + <source>Undo Local Commit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="44" /> + <source>Undo the effect of a local commit.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="46" /> + <source><b>Undo Local Commit</b><p>This undoes the effect of a local commit, returning the affected files to their uncommitted state.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="79" /> + <source>Uncommit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/UncommitExtension/ProjectHelper.py" line="95" /> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished" /> + </message> + </context> + <context> <name>UnittestExecutor</name> <message> <location filename="../Testing/Interfaces/UnittestExecutor.py" line="52" /> @@ -91312,7 +91535,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7892" /> + <location filename="../UI/UserInterface.py" line="7893" /> <location filename="../UI/UserInterface.py" line="1955" /> <location filename="../UI/UserInterface.py" line="1948" /> <source>Load session</source> @@ -92640,8 +92863,8 @@ <translation><b>键盘快捷键</b><p>将程序的键盘快捷键设置成你喜欢的按键。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7600" /> - <location filename="../UI/UserInterface.py" line="7581" /> + <location filename="../UI/UserInterface.py" line="7601" /> + <location filename="../UI/UserInterface.py" line="7582" /> <location filename="../UI/UserInterface.py" line="3402" /> <source>Export Keyboard Shortcuts</source> <translation>导出键盘快捷键</translation> @@ -92662,7 +92885,7 @@ <translation><b>导出键盘快捷键</b><p>导出程序的键盘快捷键。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7619" /> + <location filename="../UI/UserInterface.py" line="7620" /> <location filename="../UI/UserInterface.py" line="3421" /> <source>Import Keyboard Shortcuts</source> <translation>导入键盘快捷键</translation> @@ -93389,169 +93612,169 @@ </translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7108" /> - <location filename="../UI/UserInterface.py" line="7046" /> - <location filename="../UI/UserInterface.py" line="7002" /> - <location filename="../UI/UserInterface.py" line="6928" /> - <location filename="../UI/UserInterface.py" line="6864" /> - <source>Documentation Missing</source> - <translation>文档缺失</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="7109" /> <location filename="../UI/UserInterface.py" line="7047" /> <location filename="../UI/UserInterface.py" line="7003" /> <location filename="../UI/UserInterface.py" line="6929" /> <location filename="../UI/UserInterface.py" line="6865" /> + <source>Documentation Missing</source> + <translation>文档缺失</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7110" /> + <location filename="../UI/UserInterface.py" line="7048" /> + <location filename="../UI/UserInterface.py" line="7004" /> + <location filename="../UI/UserInterface.py" line="6930" /> + <location filename="../UI/UserInterface.py" line="6866" /> <source><p>The documentation starting point "<b>{0}</b>" could not be found.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7090" /> - <location filename="../UI/UserInterface.py" line="6972" /> - <source>Documentation</source> - <translation>文档</translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="6973" /> - <source><p>The PyQt{0} documentation starting point has not been configured.</p></source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="7091" /> + <location filename="../UI/UserInterface.py" line="6973" /> + <source>Documentation</source> + <translation>文档</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="6974" /> + <source><p>The PyQt{0} documentation starting point has not been configured.</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7092" /> <source><p>The PySide{0} documentation starting point has not been configured.</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7270" /> - <location filename="../UI/UserInterface.py" line="7206" /> - <source>Start Web Browser</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../UI/UserInterface.py" line="7207" /> - <source>The eric web browser could not be started.</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="7271" /> + <location filename="../UI/UserInterface.py" line="7207" /> + <source>Start Web Browser</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7208" /> + <source>The eric web browser could not be started.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7272" /> <source><p>The eric web browser is not started.</p><p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7317" /> + <location filename="../UI/UserInterface.py" line="7318" /> <source>Open Browser</source> <translation>打开浏览器</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7317" /> + <location filename="../UI/UserInterface.py" line="7318" /> <source>Could not start a web browser</source> <translation>无法启动网络浏览器</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7621" /> - <location filename="../UI/UserInterface.py" line="7583" /> + <location filename="../UI/UserInterface.py" line="7622" /> + <location filename="../UI/UserInterface.py" line="7584" /> <source>Keyboard Shortcuts File (*.ekj)</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7601" /> + <location filename="../UI/UserInterface.py" line="7602" /> <source><p>The keyboard shortcuts file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7805" /> + <location filename="../UI/UserInterface.py" line="7806" /> <source>Load crash session...</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7808" /> + <location filename="../UI/UserInterface.py" line="7809" /> <source>Clean crash sessions...</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7845" /> - <source>Read Session</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="7846" /> + <source>Read Session</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7847" /> <source><p>The session file <b>{0}</b> could not be read.</p></source> <translation><p>会话文件 <b>{0}</b> 无法读取。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7869" /> + <location filename="../UI/UserInterface.py" line="7870" /> <source>Save Session</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7894" /> - <location filename="../UI/UserInterface.py" line="7871" /> + <location filename="../UI/UserInterface.py" line="7895" /> + <location filename="../UI/UserInterface.py" line="7872" /> <source>eric Session Files (*.esj)</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="7963" /> - <source>Found Crash Sessions</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="7964" /> + <source>Found Crash Sessions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7965" /> <source>These crash session files were found. Select the one to open. Select 'Cancel' to not open a crash session.</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="8037" /> - <source>Clean stale crash sessions</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="8038" /> + <source>Clean stale crash sessions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8039" /> <source>Do you really want to delete these stale crash session files?</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="8414" /> - <source>Drop Error</source> - <translation>降落误差</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="8415" /> + <source>Drop Error</source> + <translation>降落误差</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8416" /> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> 不是一个文件。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="8612" /> - <source>Upgrade available</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="8613" /> + <source>Upgrade available</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8614" /> <source><p>A newer version of the <b>eric-ide</b> package is available at <a href="{0}/eric-ide/">PyPI</a>.</p><p>Installed: {1}<br/>Available: <b>{2}</b></p><p>Shall <b>eric-ide</b> be upgraded?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="8661" /> - <source>First time usage</source> - <translation>第一次使用</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="8662" /> + <source>First time usage</source> + <translation>第一次使用</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8663" /> <source>eric has not been configured yet. The configuration dialog will be started.</source> <translation type="unfinished" /> </message> <message> - <location filename="../UI/UserInterface.py" line="8684" /> + <location filename="../UI/UserInterface.py" line="8685" /> <source>Select Workspace Directory</source> <translation>选择工作区目录</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="8852" /> - <source>Unsaved Data Detected</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../UI/UserInterface.py" line="8853" /> + <source>Unsaved Data Detected</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../UI/UserInterface.py" line="8854" /> <source>Some editors contain unsaved data. Shall these be saved?</source> <translation type="unfinished" /> </message> @@ -100558,8 +100781,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>&Browsing History</source> - <translation type="unfinished">浏览历史(&B)</translation> + <source>Browsing History</source> + <translation type="unfinished" /> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100598,8 +100821,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>&Search History</source> - <translation type="unfinished">搜索历史(&S)</translation> + <source>Search History</source> + <translation type="unfinished" /> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100608,8 +100831,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>Download &History</source> - <translation type="unfinished">下载记录(&H)</translation> + <source>Download History</source> + <translation type="unfinished" /> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100618,8 +100841,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>&Cookies</source> - <translation type="unfinished">&Cookies</translation> + <source>Cookies</source> + <translation type="unfinished">Cookies</translation> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100628,8 +100851,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>Cached &Web Pages</source> - <translation type="unfinished">缓存的网页(&W)</translation> + <source>Cached Web Pages</source> + <translation type="unfinished" /> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100638,8 +100861,18 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>Website &Icons</source> - <translation type="unfinished">网站图标(&I)</translation> + <source>Website Icons</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> + <source>Select to clear the website permissions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> + <source>Website Permissions</source> + <translation type="unfinished" /> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100648,8 +100881,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>Saved &Passwords</source> - <translation type="unfinished">保存的密码(&P)</translation> + <source>Saved Passwords</source> + <translation type="unfinished" /> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> @@ -100658,14 +100891,46 @@ </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> - <source>&Zoom Settings</source> - <translation type="unfinished">缩放设置(&Z)</translation> + <source>Zoom Settings</source> + <translation type="unfinished" /> </message> <message> <location filename="../WebBrowser/WebBrowserClearPrivateDataDialog.ui" line="0" /> <source>SSL Certificate Error Exceptions</source> <translation type="unfinished" /> </message> + <message> + <source>&Browsing History</source> + <translation type="vanished">浏览历史(&B)</translation> + </message> + <message> + <source>&Search History</source> + <translation type="vanished">搜索历史(&S)</translation> + </message> + <message> + <source>Download &History</source> + <translation type="vanished">下载记录(&H)</translation> + </message> + <message> + <source>&Cookies</source> + <translation type="vanished">&Cookies</translation> + </message> + <message> + <source>Cached &Web Pages</source> + <translation type="vanished">缓存的网页(&W)</translation> + </message> + <message> + <source>Website &Icons</source> + <translation type="vanished">网站图标(&I)</translation> + </message> + <message> + <source>Saved &Passwords</source> + <translation type="vanished">保存的密码(&P)</translation> + </message> + <message> + <source>&Zoom Settings</source> + <translation type="vanished">缩放设置(&Z)</translation> + </message> </context> <context> <name>WebBrowserJavaScriptConsole</name> @@ -101199,6 +101464,16 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/WebBrowserPage.ui" line="0" /> + <source>Select to store website permission settings in memory only.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserPage.ui" line="0" /> + <source>Do not persist website permissions</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/WebBrowserPage.ui" line="0" /> <source><p>Select to allow reading from all canvas elements.</p> <p><b>Note:</b> Disable this option to prevent canvas fingerprinting.</p></source> <translation type="unfinished" /> @@ -101611,32 +101886,87 @@ <translation type="unfinished"><b>注意：</b>设置过高的分隔将会减慢滚动速度。</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="194" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="78" /> + <source><p>Allow <b>{0}</b> to access your location information?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="83" /> + <source><p>Allow <b>{0}</b> to access your microphone?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="89" /> + <source><p>Allow <b>{0}</b> to access your webcam?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="95" /> + <source><p>Allow <b>{0}</b> to access your microphone and webcam?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="100" /> + <source><p>Allow <b>{0}</b> to lock your mouse cursor?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="105" /> + <source><p>Allow <b>{0}</b> to capture video of your desktop?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="111" /> + <source><p>Allow <b>{0}</b> to capture audio and video of your desktop?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="118" /> + <source><p>Allow <b>{0}</b> to show notifications on your desktop?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="124" /> + <source><p>Allow <b>{0}</b> to read from and write to the clipboard?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="130" /> + <source><p>Allow <b>{0}</b> to access fonts stored on this machine?</p></source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="269" /> <source>Suspicuous URL detected</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="195" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="270" /> <source><p>The URL <b>{0}</b> was found in the Safe Browsing database.</p>{1}</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="541" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="396" /> + <source>Permission Request</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserPage.py" line="636" /> <source>Register Protocol Handler</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="542" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="637" /> <source><p>Allow the Web Site <b>{0}</b> to handle all <b>{1}</b> links?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="631" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="726" /> <source>SSL Info</source> <translation type="unfinished">SSL 信息</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="632" /> + <location filename="../WebBrowser/WebBrowserPage.py" line="727" /> <source>This site does not contain SSL information.</source> <translation type="unfinished">这个站点未包括 SSL 信息。</translation> </message> @@ -104229,15 +104559,15 @@ <translation type="unfinished">扫描当前站点</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5231" /> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5221" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5248" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5238" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2220" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2218" /> <source>IP Address Report</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5245" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5262" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2232" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2230" /> <source>Domain Report</source> @@ -104264,8 +104594,8 @@ <translation type="unfinished"><b>键盘快捷键</b><p>将程序的键盘快捷键设置成你喜欢的按键。</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5651" /> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5632" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5675" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5656" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2270" /> <source>Export Keyboard Shortcuts</source> <translation type="unfinished">导出键盘快捷键</translation> @@ -104286,7 +104616,7 @@ <translation type="unfinished"><b>导出键盘快捷键</b><p>导出程序的键盘快捷键。</p></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5671" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5695" /> <location filename="../WebBrowser/WebBrowserWindow.py" line="2289" /> <source>Import Keyboard Shortcuts</source> <translation type="unfinished">导入键盘快捷键</translation> @@ -104536,99 +104866,99 @@ <translation type="unfinished">帮助引擎</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4768" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4785" /> <source>System</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4772" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4789" /> <source>ISO</source> <translation type="unfinished">ISO</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4775" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4792" /> <source>Unicode</source> <translation type="unfinished">Unicode</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4778" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4795" /> <source>Windows</source> <translation type="unfinished">Windows</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4781" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4798" /> <source>IBM</source> <translation type="unfinished">IBM</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4784" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4801" /> <source>Apple</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4787" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4804" /> <source>Other</source> <translation type="unfinished">其它</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4814" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4831" /> <source>Menu Bar</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4819" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4836" /> <source>Bookmarks</source> <translation type="unfinished">书签</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4824" /> - <source>Status Bar</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="4839" /> - <source>&Show all</source> - <translation type="unfinished">全部显示(&S)</translation> - </message> - <message> <location filename="../WebBrowser/WebBrowserWindow.py" line="4841" /> + <source>Status Bar</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4856" /> + <source>&Show all</source> + <translation type="unfinished">全部显示(&S)</translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserWindow.py" line="4858" /> <source>&Hide all</source> <translation type="unfinished">全部隐藏(&H)</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5187" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5204" /> <source>VirusTotal Scan</source> <translation type="unfinished">VirusTotal 扫描</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5188" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5205" /> <source><p>The VirusTotal scan could not be scheduled.<p> <p>Reason: {0}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5222" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5239" /> <source>Enter a valid IPv4 address in dotted quad notation:</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5232" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5249" /> <source>The given IP address is not in dotted quad notation.</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5246" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5263" /> <source>Enter a valid domain name:</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5673" /> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5634" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5697" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5658" /> <source>Keyboard Shortcuts File (*.ekj)</source> <translation type="unfinished" /> </message> <message> - <location filename="../WebBrowser/WebBrowserWindow.py" line="5652" /> + <location filename="../WebBrowser/WebBrowserWindow.py" line="5676" /> <source><p>The keyboard shortcuts file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished" /> </message> @@ -105729,38 +106059,38 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1383" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1389" /> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1955" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1391" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1964" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397" /> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1961" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1397" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1970" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1403" /> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1968" /> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1404" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1977" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1410" /> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1410" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1416" /> <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> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1429" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1435" /> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -105771,35 +106101,35 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1929" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1938" /> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1936" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945" /> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1943" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1952" /> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1948" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1957" /> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1975" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1984" /> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1981" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990" /> <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>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/icons/breeze-dark/clipboard.svg Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg version="1.1" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg"><defs><style type="text/css">.ColorScheme-Text { + color:#eff0f1; + }</style></defs><path class="ColorScheme-Text" d="m5.8571 1v2.5h-3.8571v17.5h18v-17.5h-3.8571v-2.5zm-2.5714 3.75h1.2857v2.5h12.857v-2.5h1.2857v15h-15.429zm2.5714 3.75v1.25h10.286v-1.25zm0 3.75v1.25h7.7143v-1.25zm0 3.75v1.25h3.8571v-1.25z" color="#eff0f1" fill="currentColor"/></svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/icons/breeze-dark/font.svg Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + id="svg6" + version="1.1" + viewBox="0 0 22 22" + sodipodi:docname="font.svg" + inkscape:version="1.2.2 (b0a8486541, 2022-12-01)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg"> + <sodipodi:namedview + id="namedview6" + pagecolor="#ffffff" + bordercolor="#000000" + borderopacity="0.25" + inkscape:showpageshadow="2" + inkscape:pageopacity="0.0" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1" + showgrid="false" + inkscape:zoom="46.681818" + inkscape:cx="11.010711" + inkscape:cy="11.182084" + inkscape:window-width="2580" + inkscape:window-height="1271" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="0" + inkscape:current-layer="svg6" /> + <defs + id="defs3051"> + <style + id="current-color-scheme" + type="text/css">.ColorScheme-Text { color: #fcfcfc; } </style> + </defs> + <path + id="path4" + class="ColorScheme-Text" + d="M 9.7285153,1 5.8616536,14.705357 5.7180989,15.285714 4,21 H 5.9345703 L 7.8304036,14.660714 H 14.169597 L 16.06543,21 H 18 L 16.281901,15.285714 16.138347,14.705357 12.271485,1 H 9.9791667 Z m 1.2897137,2.7678571 2.542968,9.0624999 H 8.4388021 Z" + fill="currentColor" + style="stroke-width:1.29099" /> +</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/icons/breeze-dark/vcsFastexport.svg Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + version="1.1" + viewBox="0 0 22 22" + id="svg10" + sodipodi:docname="vcsFastexport.svg" + inkscape:version="1.2.2 (b0a8486541, 2022-12-01)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg"> + <sodipodi:namedview + id="namedview12" + pagecolor="#ffffff" + bordercolor="#000000" + borderopacity="0.25" + inkscape:showpageshadow="2" + inkscape:pageopacity="0.0" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1" + showgrid="false" + inkscape:zoom="46.681818" + inkscape:cx="11.760467" + inkscape:cy="11.117819" + inkscape:window-width="1971" + inkscape:window-height="1287" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="0" + inkscape:current-layer="svg10" /> + <defs + id="defs4"> + <style + type="text/css" + id="style2">.ColorScheme-Text { + color:#eff0f1 + }</style> + </defs> + <path + d="m11 1a10 3.75 0 0 0-10 3.75v12.5a10 3.75 0 0 0 9 3.7266v-1.2441a8.75 2.5 0 0 1-7.75-2.4824v-4.4355a10 3.75 0 0 0 7.75 1.9121v-1.2441a8.75 2.5 0 0 1-7.75-2.4824v-4.4355a10 3.75 0 0 0 8.75 1.9355 10 3.75 0 0 0 8.75-1.9434v3.4434h1.25v-5.25a10 3.75 0 0 0-10-3.75zm0 1.25a8.75 2.5 0 0 1 8.75 2.5 8.75 2.5 0 0 1-8.75 2.5 8.75 2.5 0 0 1-8.75-2.5 8.75 2.5 0 0 1 8.75-2.5z" + color="#eff0f1" + fill="currentColor" + id="path6" /> + <path + d="m14.333 21v-3.3333h-3.3333v-3.3333h3.3333v-3.3333l6.6667 5-6.6667 5" + fill="#ff7f2a" + id="path8" + style="fill:#4070ff;fill-opacity:1" /> +</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/icons/breeze-dark/vcsUncommit.svg Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,58 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + version="1.1" + viewBox="0 0 22 22" + id="svg10" + sodipodi:docname="vcsUncommit.svg" + inkscape:version="1.2.2 (b0a8486541, 2022-12-01)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg"> + <sodipodi:namedview + id="namedview12" + pagecolor="#ffffff" + bordercolor="#000000" + borderopacity="0.25" + inkscape:showpageshadow="2" + inkscape:pageopacity="0.0" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1" + showgrid="false" + inkscape:zoom="46.681818" + inkscape:cx="11.963973" + inkscape:cy="10.485881" + inkscape:window-width="1782" + inkscape:window-height="1310" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="0" + inkscape:current-layer="svg10" /> + <defs + id="defs4"> + <style + type="text/css" + id="style2">.ColorScheme-Text { + color:#eff0f1 + }</style> + </defs> + <path + d="m11 1a10 3.75 0 0 0-10 3.75v12.5a10 3.75 0 0 0 9 3.7266v-1.2441a8.75 2.5 0 0 1-7.75-2.4824v-4.4355a10 3.75 0 0 0 7.75 1.9121v-1.2441a8.75 2.5 0 0 1-7.75-2.4824v-4.4355a10 3.75 0 0 0 8.75 1.9355 10 3.75 0 0 0 8.75-1.9434v3.4434h1.25v-5.25a10 3.75 0 0 0-10-3.75zm0 1.25a8.75 2.5 0 0 1 8.75 2.5 8.75 2.5 0 0 1-8.75 2.5 8.75 2.5 0 0 1-8.75-2.5 8.75 2.5 0 0 1 8.75-2.5z" + color="#eff0f1" + fill="currentColor" + id="path6" /> + <g + id="g8324"> + <path + d="M 20.9999,14.6667 H 17.6666 V 18 H 14.3333 V 14.6667 H 11 L 16,8 l 5,6.6667" + fill="#ffd42a" + id="path8" /> + <path + class="ColorScheme-Text" + d="m 11,19 v 2 h 10 v -2 z" + color="#eff0f1" + fill="#ff2a2a" + id="path3168" + style="color:#eff0f1" /> + </g> +</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/icons/breeze-light/clipboard.svg Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg version="1.1" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg"><defs><style type="text/css">.ColorScheme-Text { + color:#eff0f1; + }</style></defs><path class="ColorScheme-Text" d="m5.8571 1v2.5h-3.8571v17.5h18v-17.5h-3.8571v-2.5zm-2.5714 3.75h1.2857v2.5h12.857v-2.5h1.2857v15h-15.429zm2.5714 3.75v1.25h10.286v-1.25zm0 3.75v1.25h7.7143v-1.25zm0 3.75v1.25h3.8571v-1.25z" color="#eff0f1" fill="#232629"/></svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/icons/breeze-light/font.svg Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + id="svg6" + version="1.1" + viewBox="0 0 22 22" + sodipodi:docname="font.svg" + inkscape:version="1.2.2 (b0a8486541, 2022-12-01)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg"> + <sodipodi:namedview + id="namedview6" + pagecolor="#ffffff" + bordercolor="#000000" + borderopacity="0.25" + inkscape:showpageshadow="2" + inkscape:pageopacity="0.0" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1" + showgrid="false" + inkscape:zoom="46.681818" + inkscape:cx="11.010711" + inkscape:cy="11.117819" + inkscape:window-width="2580" + inkscape:window-height="1315" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="0" + inkscape:current-layer="svg6" /> + <defs + id="defs3051"> + <style + id="current-color-scheme" + type="text/css">.ColorScheme-Text { + color:#232629; + }</style> + </defs> + <path + id="path4" + class="ColorScheme-Text" + d="M 9.365235,1 4.3935547,14.705357 4.2089843,15.285714 2,21 H 4.4873047 L 6.9248046,14.660714 H 15.075195 L 17.512696,21 H 20 L 17.791016,15.285714 17.606445,14.705357 12.634767,1 H 9.687501 Z m 1.658203,2.7678571 3.269531,9.0624999 H 7.707031 Z" + fill="currentColor" + style="stroke-width:1.46385" /> +</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/icons/breeze-light/vcsFastexport.svg Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + version="1.1" + viewBox="0 0 22 22" + id="svg10" + sodipodi:docname="vcsFastexport.svg" + inkscape:version="1.2.2 (b0a8486541, 2022-12-01)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg"> + <sodipodi:namedview + id="namedview12" + pagecolor="#ffffff" + bordercolor="#000000" + borderopacity="0.25" + inkscape:showpageshadow="2" + inkscape:pageopacity="0.0" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1" + showgrid="false" + inkscape:zoom="46.681818" + inkscape:cx="12.242454" + inkscape:cy="10.850049" + inkscape:window-width="1784" + inkscape:window-height="1266" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="0" + inkscape:current-layer="svg10" /> + <defs + id="defs4"> + <style + type="text/css" + id="style2">.ColorScheme-Text { + color:#eff0f1 + }</style> + </defs> + <path + d="m11 1a10 3.75 0 0 0-10 3.75v12.5a10 3.75 0 0 0 9 3.7266v-1.2441a8.75 2.5 0 0 1-7.75-2.4824v-4.4355a10 3.75 0 0 0 7.75 1.9121v-1.2441a8.75 2.5 0 0 1-7.75-2.4824v-4.4355a10 3.75 0 0 0 8.75 1.9355 10 3.75 0 0 0 8.75-1.9434v3.4434h1.25v-5.25a10 3.75 0 0 0-10-3.75zm0 1.25a8.75 2.5 0 0 1 8.75 2.5 8.75 2.5 0 0 1-8.75 2.5 8.75 2.5 0 0 1-8.75-2.5 8.75 2.5 0 0 1 8.75-2.5z" + color="#eff0f1" + fill="#232629" + id="path6" /> + <path + d="m14.333 21v-3.3333h-3.3333v-3.3333h3.3333v-3.3333l6.6667 5-6.6667 5" + fill="#ff7f2a" + id="path8" + style="fill:#3030dd;fill-opacity:1" /> +</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/eric7/icons/breeze-light/vcsUncommit.svg Tue Jan 14 17:29:56 2025 +0100 @@ -0,0 +1,58 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + version="1.1" + viewBox="0 0 22 22" + id="svg8697" + sodipodi:docname="vcsUncommit.svg" + inkscape:version="1.2.2 (b0a8486541, 2022-12-01)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg"> + <sodipodi:namedview + id="namedview8699" + pagecolor="#ffffff" + bordercolor="#000000" + borderopacity="0.25" + inkscape:showpageshadow="2" + inkscape:pageopacity="0.0" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1" + showgrid="false" + inkscape:zoom="46.681818" + inkscape:cx="11.674781" + inkscape:cy="11.182084" + inkscape:window-width="1681" + inkscape:window-height="1267" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="0" + inkscape:current-layer="svg8697" /> + <defs + id="defs8691"> + <style + type="text/css" + id="style8689">.ColorScheme-Text { + color:#eff0f1 + }</style> + </defs> + <path + d="m11 1a10 3.75 0 0 0-10 3.75v12.5a10 3.75 0 0 0 9 3.7266v-1.2441a8.75 2.5 0 0 1-7.75-2.4824v-4.4355a10 3.75 0 0 0 7.75 1.9121v-1.2441a8.75 2.5 0 0 1-7.75-2.4824v-4.4355a10 3.75 0 0 0 8.75 1.9355 10 3.75 0 0 0 8.75-1.9434v3.4434h1.25v-5.25a10 3.75 0 0 0-10-3.75zm0 1.25a8.75 2.5 0 0 1 8.75 2.5 8.75 2.5 0 0 1-8.75 2.5 8.75 2.5 0 0 1-8.75-2.5 8.75 2.5 0 0 1 8.75-2.5z" + color="#eff0f1" + fill="#232629" + id="path8693" /> + <g + id="g14935"> + <path + d="M 21,14.6667 H 17.6667 V 18 h -3.3333 v -3.3333 h -3.3333 l 5,-6.6667 5,6.6667" + fill="#ff9000" + id="path8695" /> + <path + class="ColorScheme-Text" + d="m 11,19 v 2 h 10 v -2 z" + color="#eff0f1" + fill="#ff2a2a" + id="path12113" + style="color:#eff0f1" /> + </g> +</svg>
